diff --git a/.github/CODEOWNERS_vim b/.github/CODEOWNERS_vim index e95864feee..f5a45c4d95 100644 --- a/.github/CODEOWNERS_vim +++ b/.github/CODEOWNERS_vim @@ -11,9 +11,12 @@ runtime/autoload/freebasic.vim @dkearns runtime/autoload/getscript.vim @cecamp +runtime/autoload/haskell.vim @alx741 +runtime/autoload/javascript.vim @jsit runtime/autoload/netrw.vim @cecamp runtime/autoload/netrwFileHandlers.vim @cecamp runtime/autoload/netrwSettings.vim @cecamp +runtime/autoload/php.vim @david-szabo97 runtime/autoload/rubycomplete.vim @segfault @dkearns runtime/autoload/tar.vim @cecamp runtime/autoload/vimball.vim @cecamp @@ -52,6 +55,7 @@ runtime/compiler/eruby.vim @dkearns runtime/compiler/fbc.vim @dkearns runtime/compiler/gawk.vim @dkearns runtime/compiler/gjs.vim @dkearns +runtime/compiler/go.vim @dbarnett runtime/compiler/haml.vim @tpope runtime/compiler/icon.vim @dkearns runtime/compiler/javac.vim @dkearns @@ -72,6 +76,7 @@ runtime/compiler/rubocop.vim @dkearns runtime/compiler/ruby.vim @tpope @dkearns runtime/compiler/rubyunit.vim @dkearns runtime/compiler/sass.vim @tpope +runtime/compiler/sdoc.vim @gpanders runtime/compiler/se.vim @dkearns runtime/compiler/shellcheck.vim @dkearns runtime/compiler/sml.vim @dkearns @@ -98,19 +103,23 @@ runtime/ftplugin/basic.vim @dkearns runtime/ftplugin/bst.vim @tpope runtime/ftplugin/cfg.vim @chrisbra runtime/ftplugin/clojure.vim @axvr +runtime/ftplugin/cs.vim @nickspoons runtime/ftplugin/csh.vim @dkearns runtime/ftplugin/css.vim @dkearns runtime/ftplugin/cucumber.vim @tpope runtime/ftplugin/dosbatch.vim @mrdubya runtime/ftplugin/eiffel.vim @dkearns +runtime/ftplugin/erlang.vim @hcs42 runtime/ftplugin/eruby.vim @tpope @dkearns runtime/ftplugin/fpcmake.vim @dkearns runtime/ftplugin/freebasic.vim @dkearns +runtime/ftplugin/fstab.vim @rid9 runtime/ftplugin/git.vim @tpope runtime/ftplugin/gitcommit.vim @tpope runtime/ftplugin/gitconfig.vim @tpope runtime/ftplugin/gitrebase.vim @tpope runtime/ftplugin/gitsendemail.vim @tpope +runtime/ftplugin/go.vim @dbarnett runtime/ftplugin/gprof.vim @dpelle runtime/ftplugin/haml.vim @tpope runtime/ftplugin/hgcommit.vim @k-takata @@ -119,7 +128,10 @@ runtime/ftplugin/icon.vim @dkearns runtime/ftplugin/indent.vim @dkearns runtime/ftplugin/javascript.vim @dkearns runtime/ftplugin/javascriptreact.vim @dkearns +runtime/ftplugin/jsonc.vim @izhakjakov +runtime/ftplugin/julia.vim @carlobaldassi runtime/ftplugin/kconfig.vim @chrisbra +runtime/ftplugin/less.vim @genoma runtime/ftplugin/liquid.vim @tpope runtime/ftplugin/lua.vim @dkearns runtime/ftplugin/m3build.vim @dkearns @@ -134,17 +146,26 @@ runtime/ftplugin/nsis.vim @k-takata runtime/ftplugin/octave.vim @dkearns runtime/ftplugin/pascal.vim @dkearns runtime/ftplugin/pbtxt.vim @lakshayg -runtime/ftplugin/perl.vim @petdance @dkearns runtime/ftplugin/pdf.vim @tpope +runtime/ftplugin/perl.vim @petdance @dkearns runtime/ftplugin/pod.vim @petdance @dkearns runtime/ftplugin/postscr.vim @mrdubya runtime/ftplugin/ps1.vim @heaths runtime/ftplugin/ps1xml.vim @heaths +runtime/ftplugin/python.vim @tpict runtime/ftplugin/qb64.vim @dkearns +runtime/ftplugin/r.vim @jalvesaq +runtime/ftplugin/rhelp.vim @jalvesaq +runtime/ftplugin/rmd.vim @jalvesaq +runtime/ftplugin/rnoweb.vim @jalvesaq runtime/ftplugin/routeros.vim @zainin +runtime/ftplugin/rrst.vim @jalvesaq +runtime/ftplugin/rst.vim @marshallward runtime/ftplugin/ruby.vim @tpope @dkearns runtime/ftplugin/sass.vim @tpope +runtime/ftplugin/scala.vim @derekwyatt runtime/ftplugin/scss.vim @tpope +runtime/ftplugin/sdoc.vim @gpanders runtime/ftplugin/solution.vim @dkearns runtime/ftplugin/spec.vim @ignatenkobrain runtime/ftplugin/systemverilog.vim @Kocha @@ -156,6 +177,7 @@ runtime/ftplugin/toml.vim @averms runtime/ftplugin/tt2html.vim @petdance runtime/ftplugin/typescript.vim @dkearns runtime/ftplugin/typescriptreact.vim @dkearns +runtime/ftplugin/wast.vim @rhysd runtime/ftplugin/wget.vim @dkearns runtime/ftplugin/wget2.vim @dkearns runtime/ftplugin/xml.vim @chrisbra @@ -166,21 +188,33 @@ runtime/indent/bst.vim @tpope runtime/indent/cdl.vim @dkearns runtime/indent/clojure.vim @axvr runtime/indent/config.vim @dkearns +runtime/indent/cs.vim @nickspoons runtime/indent/css.vim @dkearns runtime/indent/cucumber.vim @tpope runtime/indent/d.vim @dkearns runtime/indent/dosbatch.vim @k-takata runtime/indent/dtd.vim @dkearns runtime/indent/dylan.vim @dkearns +runtime/indent/eiffel.vim @jocelyn runtime/indent/elm.vim @andys8 +runtime/indent/erlang.vim @hcs42 runtime/indent/eruby.vim @tpope @dkearns runtime/indent/eterm.vim @dkearns +runtime/indent/falcon.vim @steveno runtime/indent/framescript.vim @dkearns runtime/indent/freebasic.vim @dkearns runtime/indent/gitconfig.vim @tpope +runtime/indent/gitolite.vim @sitaramc +runtime/indent/go.vim @dbarnett runtime/indent/haml.vim @tpope runtime/indent/idlang.vim @dkearns +runtime/indent/java.vim @xuhdev +runtime/indent/javascript.vim @bounceme +runtime/indent/json.vim @elzr +runtime/indent/jsonc.vim @izhakjakov +runtime/indent/julia.vim @carlobaldassi runtime/indent/ld.vim @dkearns +runtime/indent/less.vim @genoma runtime/indent/liquid.vim @tpope runtime/indent/make.vim @dkearns runtime/indent/meson.vim @Liambeguin @@ -189,21 +223,33 @@ runtime/indent/nginx.vim @chr4 runtime/indent/nsis.vim @k-takata runtime/indent/occam.vim @dkearns runtime/indent/perl.vim @petdance +runtime/indent/php.vim @2072 runtime/indent/postscr.vim @mrdubya runtime/indent/prolog.vim @dkearns runtime/indent/ps1.vim @heaths runtime/indent/qb64.vim @dkearns +runtime/indent/r.vim @jalvesaq runtime/indent/readline.vim @dkearns +runtime/indent/rhelp.vim @jalvesaq +runtime/indent/rmd.vim @jalvesaq +runtime/indent/rnoweb.vim @jalvesaq +runtime/indent/rrst.vim @jalvesaq runtime/indent/ruby.vim @AndrewRadev @dkearns runtime/indent/sass.vim @tpope +runtime/indent/scala.vim @derekwyatt runtime/indent/scss.vim @tpope runtime/indent/sh.vim @chrisbra runtime/indent/systemverilog.vim @Kocha runtime/indent/tcl.vim @dkearns runtime/indent/tcsh.vim @dkearns runtime/indent/teraterm.vim @k-takata +runtime/indent/typescript.vim @HerringtonDarkholme +runtime/indent/vroom.vim @dbarnett +runtime/indent/wast.vim @rhysd runtime/indent/xml.vim @chrisbra runtime/indent/zsh.vim @chrisbra +runtime/keymap/armenian-eastern_utf-8.vim @blinskey +runtime/keymap/armenian-western_utf-8.vim @blinskey runtime/keymap/tamil_tscii.vim @yegappan runtime/lang/menu_en_gb.latin1.vim @mrdubya runtime/pack/dist/opt/cfilter/plugin/cfilter.vim @yegappan @@ -217,35 +263,51 @@ runtime/plugin/zipPlugin.vim @cecamp runtime/syntax/aidl.vim @dpelle runtime/syntax/amiga.vim @cecamp runtime/syntax/arduino.vim @johshoff +runtime/syntax/asciidoc.vim @aerostitch runtime/syntax/asm.vim @dkearns runtime/syntax/asmh8300.vim @dkearns runtime/syntax/asterisk.vim @jaunis +runtime/syntax/autohotkey.vim @mmikeww runtime/syntax/awk.vim @dkearns runtime/syntax/basic.vim @dkearns runtime/syntax/bst.vim @tpope +runtime/syntax/bzl.vim @dbarnett +runtime/syntax/bzr.vim @hdima runtime/syntax/cabal.vim @coot runtime/syntax/cabalconfig.vim @coot runtime/syntax/cabalproject.vim @coot +runtime/syntax/cf.vim @ernstvanderlinden runtime/syntax/clojure.vim @axvr runtime/syntax/cs.vim @nickspoons runtime/syntax/csh.vim @cecamp runtime/syntax/cucumber.vim @tpope +runtime/syntax/d.vim @JesseKPhillips +runtime/syntax/dart.vim @pr3d4t0r runtime/syntax/datascript.vim @dpelle runtime/syntax/dcl.vim @cecamp runtime/syntax/desktop.vim @e-kwsm runtime/syntax/dosbatch.vim @mrdubya +runtime/syntax/dosini.vim @xuhdev runtime/syntax/dot.vim @mmottl runtime/syntax/doxygen.vim @frogonwheels runtime/syntax/dtd.vim @chrisbra runtime/syntax/dts.vim @zonque +runtime/syntax/eiffel.vim @jocelyn runtime/syntax/elmfilt.vim @cecamp +runtime/syntax/erlang.vim @hcs42 runtime/syntax/eruby.vim @tpope @dkearns runtime/syntax/exports.vim @cecamp +runtime/syntax/falcon.vim @steveno +runtime/syntax/forth.vim @jkotlinski runtime/syntax/fpcmake.vim @dkearns +runtime/syntax/fstab.vim @rid9 runtime/syntax/git.vim @tpope runtime/syntax/gitcommit.vim @tpope runtime/syntax/gitconfig.vim @tpope +runtime/syntax/gitolite.vim @sitaramc runtime/syntax/gitrebase.vim @tpope +runtime/syntax/go.vim @bhcleek +runtime/syntax/godoc.vim @dbarnett runtime/syntax/gprof.vim @dpelle runtime/syntax/groff.vim @jmarshall runtime/syntax/haml.vim @tpope @@ -254,6 +316,10 @@ runtime/syntax/hgcommit.vim @k-takata runtime/syntax/i3config.vim @hiqua runtime/syntax/icon.vim @dkearns runtime/syntax/indent.vim @dkearns +runtime/syntax/jargon.vim @h3xx +runtime/syntax/java.vim @fleiner +runtime/syntax/jsonc.vim @izhakjakov +runtime/syntax/julia.vim @carlobaldassi runtime/syntax/kconfig.vim @chrisbra runtime/syntax/less.vim @genoma runtime/syntax/lex.vim @cecamp @@ -264,13 +330,16 @@ runtime/syntax/m3build.vim @dkearns runtime/syntax/m3quake.vim @dkearns runtime/syntax/mailcap.vim @dkearns runtime/syntax/make.vim @rohieb +runtime/syntax/mallard.vim @jhradilek runtime/syntax/maple.vim @cecamp runtime/syntax/markdown.vim @tpope runtime/syntax/mason.vim @petdance runtime/syntax/meson.vim @Liambeguin runtime/syntax/modula3.vim @dkearns +runtime/syntax/n1ql.vim @pr3d4t0r runtime/syntax/netrw.vim @cecamp runtime/syntax/nginx.vim @chr4 +runtime/syntax/ninja.vim @nico runtime/syntax/nroff.vim @jmarshall runtime/syntax/nsis.vim @k-takata runtime/syntax/pascal.vim @dkearns @@ -278,6 +347,7 @@ runtime/syntax/pbtxt.vim @lakshayg runtime/syntax/pdf.vim @tpope runtime/syntax/perl.vim @petdance runtime/syntax/php.vim @TysonAndre +runtime/syntax/plsql.vim @lee-lindley runtime/syntax/pod.vim @petdance runtime/syntax/postscr.vim @mrdubya runtime/syntax/privoxy.vim @dkearns @@ -286,20 +356,34 @@ runtime/syntax/ps1.vim @heaths runtime/syntax/ps1xml.vim @heaths runtime/syntax/psl.vim @danielkho runtime/syntax/qb64.vim @dkearns +runtime/syntax/r.vim @jalvesaq +runtime/syntax/raml.vim @in3d +runtime/syntax/ratpoison.vim @trapd00r runtime/syntax/rc.vim @chrisbra +runtime/syntax/rcs.vim @hdima runtime/syntax/rebol.vim @mrdubya +runtime/syntax/rego.vim @zenmatic +runtime/syntax/resolv.vim @rid9 +runtime/syntax/rmd.vim @jalvesaq +runtime/syntax/rng.vim @jhradilek runtime/syntax/routeros.vim @zainin runtime/syntax/rpcgen.vim @cecamp +runtime/syntax/rrst.vim @jalvesaq +runtime/syntax/rst.vim @marshallward runtime/syntax/ruby.vim @dkearns runtime/syntax/sass.vim @tpope +runtime/syntax/scala.vim @derekwyatt runtime/syntax/scss.vim @tpope +runtime/syntax/sdoc.vim @gpanders runtime/syntax/sh.vim @cecamp runtime/syntax/sm.vim @cecamp runtime/syntax/spec.vim @ignatenkobrain runtime/syntax/sqloracle.vim @chrisbra +runtime/syntax/squirrel.vim @zenmatic runtime/syntax/sshconfig.vim @Jakuje runtime/syntax/sshdconfig.vim @Jakuje runtime/syntax/sudoers.vim @e-kwsm +runtime/syntax/svn.vim @hdima runtime/syntax/systemverilog.vim @Kocha runtime/syntax/tags.vim @cecamp runtime/syntax/tap.vim @petdance @@ -312,7 +396,12 @@ runtime/syntax/toml.vim @averms runtime/syntax/tt2.vim @petdance runtime/syntax/tt2html.vim @petdance runtime/syntax/tt2js.vim @petdance +runtime/syntax/typescript.vim @HerringtonDarkholme +runtime/syntax/typescriptcommon.vim @HerringtonDarkholme +runtime/syntax/typescriptreact.vim @HerringtonDarkholme runtime/syntax/vim.vim @cecamp +runtime/syntax/vroom.vim @dbarnett +runtime/syntax/wast.vim @rhysd runtime/syntax/wget.vim @dkearns runtime/syntax/wget2.vim @dkearns runtime/syntax/xbl.vim @dkearns diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 434c097e81..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,135 +0,0 @@ -language: c - -os: osx - -compiler: clang - -env: - global: - - MACOSX_DEPLOYMENT_TARGET=10.9 - VERSIONER_PERL_VERSION=5.18 - VERSIONER_PYTHON_VERSION=2.7 - vi_cv_path_python=/usr/bin/python - vi_cv_path_python3=/usr/local/bin/python3 - vi_cv_path_plain_lua=/usr/local/bin/lua - vi_cv_path_ruby=/usr/local/opt/ruby/bin/ruby - vi_cv_dll_name_perl=/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE/libperl.dylib - vi_cv_dll_name_python=/System/Library/Frameworks/Python.framework/Versions/2.7/Python - vi_cv_dll_name_python3=/usr/local/Frameworks/Python.framework/Versions/3.9/Python - vi_cv_dll_name_ruby=/usr/local/opt/ruby/lib/libruby.dylib - VIMCMD=src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim - MACVIM_BIN=src/MacVim/build/Release/MacVim.app/Contents/MacOS/MacVim - CONFOPT="--with-features=huge --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-gui=macvim --with-macarchs=x86_64" - BASH_SILENCE_DEPRECATION_WARNING=1 - -_anchors: - - &lang_env - env: - - LANGOPT="--enable-perlinterp=dynamic --enable-pythoninterp=dynamic --enable-python3interp=dynamic --enable-rubyinterp=dynamic --enable-luainterp=dynamic --with-lua-prefix=/usr/local" - HAS_GETTEXT=1 - - &homebrew - addons: - homebrew: - packages: - - gettext - - lua - - python - - ruby - update: true - - &caches - cache: - directories: - - /usr/local/Homebrew/Library/Homebrew/vendor/ - - /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/ - - ${TRAVIS_BUILD_DIR}/src/MacVim/build/Release/MacVim.app/ - -script: - - set -o errexit - - echo -e "\\033[33;1mConfiguring MacVim\\033[0m" && echo -en "travis_fold:start:configure\\r\\033[0K" - - NPROC=$(getconf _NPROCESSORS_ONLN) - - make distclean - - ./configure ${CONFOPT} ${LANGOPT} --enable-fail-if-missing - - sed -i.bak -f ci/config.mk.sed -f ci/config.mk.clang.sed src/auto/config.mk - # Ruby is keg-only in Homebrew, so need to manually link in the path so Vim will know where to look for the binaries. - - perl -p -i -e "s#(?<=-DDYNAMIC_RUBY_DLL=\\\\\").*?(?=\\\\\")#${vi_cv_dll_name_ruby}#" src/auto/config.mk - - cat src/auto/config.mk - - cat src/auto/config.h - - | - if [[ -n "${LANGOPT}" ]]; then - grep -q -- "-DDYNAMIC_PERL_DLL=\\\\\"${vi_cv_dll_name_perl}\\\\\"" src/auto/config.mk - grep -q -- "-DDYNAMIC_PYTHON_DLL=\\\\\"${vi_cv_dll_name_python}\\\\\"" src/auto/config.mk - grep -q -- "-DDYNAMIC_PYTHON3_DLL=\\\\\"${vi_cv_dll_name_python3}\\\\\"" src/auto/config.mk - grep -q -- "-DDYNAMIC_RUBY_DLL=\\\\\"${vi_cv_dll_name_ruby}\\\\\"" src/auto/config.mk - fi - - echo -en "travis_fold:end:configure\\r\\033[0K" - - - echo -e "\\033[33;1mBuilding MacVim\\033[0m" && echo -en "travis_fold:start:build\\r\\033[0K" - - make -j${NPROC} - - echo -en "travis_fold:end:build\\r\\033[0K" - - ${VIMCMD} --version - # Disable errexit so flaky tests won't immediately exit to allow us to see all the errors. - - set +o errexit - - # Smoketest scripting languages - - echo -e "\\033[33;1mSmoketest\\033[0m" && echo -en "travis_fold:start:smoketest\\r\\033[0K" - - | - macvim_excmd() { - ${VIMCMD} -u NONE -i NONE -g -f -X -V1 -es "$@" -c 'echo ""' -c 'qall!' 2>&1 - } - - if [[ -n "${LANGOPT}" ]]; then macvim_excmd -c 'lua print("Test")'; fi - - if [[ -n "${LANGOPT}" ]]; then macvim_excmd -c 'perl VIM::Msg("Test")'; fi - - if [[ -n "${LANGOPT}" ]]; then macvim_excmd -c 'py import sys; print("Test")'; fi - - if [[ -n "${LANGOPT}" ]]; then macvim_excmd -c 'py3 import sys; print("Test")'; fi - - if [[ -n "${LANGOPT}" ]]; then macvim_excmd -c 'ruby puts("Test")'; fi - # Check that localized messages work by printing ':version' and checking against localized word - - if [[ -n "${HAS_GETTEXT}" ]]; then macvim_excmd -c 'lang es_ES' -c 'version' | grep Enlazado; fi - # Make sure there isn't any dynamic linkage to third-party dependencies in the built binary, as we should only use - # static linkage to avoid dependency hell. Test that all those dylib's are in /usr/lib which is bundled with macOS and not third-party. - - (! otool -L ${VIMCMD} | grep '\.dylib\s' | grep -v '^\s*/usr/lib/') - # Make sure we are building x86_64 only. arm64 builds don't work properly now, so we don't want to accidentally build - # it as it will get prioritized by Apple Silicon Macs. - - (lipo -archs ${VIMCMD} | grep '^x86_64$') - - (lipo -archs ${MACVIM_BIN} | grep '^x86_64$') - - echo -en "travis_fold:end:smoketest\\r\\033[0K" - - # Run standard test suites. - - echo -e "\\033[33;1mTesting MacVim\\033[0m" && echo -en "travis_fold:start:test\\r\\033[0K" - - make test - - make -C runtime/doc vimtags VIMEXE=../../src/MacVim/build/Release/MacVim.app/Contents/bin/vim - - echo -en "travis_fold:end:test\\r\\033[0K" - - echo -e "\\033[33;1mTesting MacVim (GUI)\\033[0m" && echo -en "travis_fold:start:test_gui\\r\\033[0K" - - make -C src/testdir clean - - make -C src testgui - - echo -en "travis_fold:end:test_gui\\r\\033[0K" - -jobs: - include: - - osx_image: xcode12.2 - <<: *lang_env - <<: *homebrew - <<: *caches - # Disable unnecessary builds to cut down on Travis usage due to billing changes for open-source projects. - #- osx_image: xcode11.6 - #- osx_image: xcode9.4 - #- osx_image: xcode7.3 - - stage: deploy - osx_image: xcode12.2 - <<: *lang_env - <<: *caches - script: skip - before_deploy: - # Use the --skip-jenkins flag to skip the prettify osascript calls which will fail due to permission issues in Travis CI's Mac environment. - - make -C src macvim-dmg CREATEDMG_FLAGS=--skip-jenkins - deploy: - provider: releases - token: - secure: ukjm+qbuNiTli25Ut2BoVpeBCV+JyVbRUwPqjTKrJxfHz34bpr38eSbryIB8BgKBItgzE876Yoqa3CD0k8mqGClis1+98MtrYFpAkO97juJmHpcZZZB7ausbHGf7Z7VdMT4jBjjVGcBeaNj0mio0hwem0/S4WyJK3M/3Fym995CltCUtJKRfMvRiGkWZqUs8K7EZf53DFR6CXUn38rq/3B88SeK51OZuCkMsiDWLGYCdayH19vJfFrTF8MYMQYDYxz16Q/Kf21PVhwia7HEhOzqnXS8RXS+vLkZw8mzIxowX+w6NT90q7Sj0ENdR7YaS27QPfDdhZEnOgpgqj+za63lpiyIdRcgSBkGxNYrM6B5KhiwC1VocBxCBdCxT5WXlx9rA9+k4CASdsxAW/MtQOK6PRMfZEnAB+ShFvshM2H/iE5Jch+o/SIjCXhdkeASD5qov2x6eXcsEVu8PIxvEUptCpHeqJTN5/26nfKsvOdrsqbwJbDluwISOKfEPhohb8Hn7JqOJNTS2aJr3jfvU+egE1NS0eLqKPXecu7MOOsOq1CQL6WxblphG2JCCmAOuNMYrJx9+w28ekMDRDAbI9r5nWcPLZtBqjFUyuBXXM7UknMar0FZ2fd7YTi/Gki3n56UN0lKaSAKaJB9EXlneDSKp/1ogsETr9/b7jz0s6lI= - file: src/MacVim/build/Release/MacVim.dmg - skip_cleanup: true - draft: true - on: - all_branches: true - tags: true - repo: macvim-dev/macvim - -# vim:set sts=2 sw=2 tw=0 et: diff --git a/Filelist b/Filelist index 4a2bb151be..78cab25d65 100644 --- a/Filelist +++ b/Filelist @@ -625,7 +625,6 @@ SRC_DOS_BIN = \ src/xpm/x86/lib-vc14/libXpm.lib \ src/xpm/x86/lib/libXpm.a \ src/xpm/x86/lib/libXpm.lib \ - runtime/bitmaps/vim.ico \ nsis/icons.zip \ # source files for Amiga, DOS, etc. (also in the extra archive) diff --git a/Makefile b/Makefile index 45cffff573..5b5c8bded7 100644 --- a/Makefile +++ b/Makefile @@ -84,8 +84,8 @@ indenttest: # To do all this you need the Unix archive and compiled binaries. # Before creating an archive first delete all backup files, *.orig, etc. -MAJOR = 8 -MINOR = 2 +MAJOR = 9 +MINOR = 0 # CHECKLIST for creating a new version: # @@ -110,7 +110,7 @@ MINOR = 2 # - Check for missing entries in runtime/makemenu.vim (with checkmenu script). # - Check for missing options in runtime/optwin.vim et al. (with check.vim). # - Do "make menu" to update the runtime/synmenu.vim file. -# - Add remarks for changes to runtime/doc/version8.txt. +# - Add remarks for changes to runtime/doc/version9.txt. # - Check that runtime/doc/help.txt doesn't contain entries in "LOCAL # ADDITIONS". # - In runtime/doc run "make" and "make html" to check for errors. @@ -144,7 +144,7 @@ MINOR = 2 # - > make dossrc # > make dosrt # Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC. -# This creates the directory vim/vim82 and puts all files in there. +# This creates the directory vim/vim90 and puts all files in there. # Win32 console version build: # - See src/INSTALLpc.txt for installing the compiler and SDK. # - Set environment for Visual C++ 2015: @@ -202,7 +202,7 @@ MINOR = 2 # Note: VisVim needs to be build with MSVC 5, newer versions don't work. # gvimext64.dll can be obtained from: # https://github.com/vim/vim-win32-installer/releases -# It is part of gvim_8.2.*_x64.zip as vim/vim82/GvimExt/gvimext64.dll. +# It is part of gvim_9.0.*_x64.zip as vim/vim90/GvimExt/gvimext64.dll. # - Make sure there is a diff.exe two levels up (get it from a previous Vim # version). Also put winpty32.dll and winpty-agent.exe there. # - go to ../nsis and do: diff --git a/README.txt b/README.txt index 54f207c0d8..2206088e72 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README.txt for version 8.2 of Vim: Vi IMproved. +README.txt for version 9.0 of Vim: Vi IMproved. WHAT IS VIM? diff --git a/README_vim.md b/README_vim.md index 5c8403c3f9..214bedfee0 100644 --- a/README_vim.md +++ b/README_vim.md @@ -149,7 +149,7 @@ Send any other comments, patches, flowers and suggestions to: Bram Moolenaar -This is `README.md` for version 8.2 of Vim: Vi IMproved. +This is `README.md` for version 9.0 of Vim: Vi IMproved. ## Translations of this README ## diff --git a/READMEdir/Contents b/READMEdir/Contents index c8107bb224..d58dbf276e 100644 --- a/READMEdir/Contents +++ b/READMEdir/Contents @@ -9,15 +9,15 @@ Vim Vi IMproved. A clone of the UNIX text editor Vi. Very useful messages, shows current file name in window title, on-line help, rectangular cut/paste, etc., etc., etc... - Version 8.2. Also runs under UNIX, MS-Windows, Mac, etc. - vim82rt.tgz contains the documentation and syntax files. - vim82bin.tgz contains the binaries. - vim82src.tgz contains the sources. + Version 9.0. Also runs under UNIX, MS-Windows, Mac, etc. + vim90rt.tgz contains the documentation and syntax files. + vim90bin.tgz contains the binaries. + vim90src.tgz contains the sources. Author: Bram Moolenaar et al. Xxd Hex dumper and reader. Can be used to view files as hex, edit them and write them back. Can also be used to patch files. - Version 1.10 (1997 May 22) + Version 2022 Jan 14 Author: Juergen Weigert diff --git a/READMEdir/README_ami.txt b/READMEdir/README_ami.txt index 7ea4332767..b0f8b2dc57 100644 --- a/READMEdir/README_ami.txt +++ b/READMEdir/README_ami.txt @@ -1,4 +1,4 @@ -README_ami.txt for version 8.2 of Vim: Vi IMproved. +README_ami.txt for version 9.0 of Vim: Vi IMproved. This file explains the installation of Vim on Amiga systems. See README.txt for general information about Vim. @@ -16,8 +16,8 @@ easily upgrade to a new version. For example: You would then unpack the archives like this: cd dh0:editors - tar xf t:vim82bin.tar - tar xf t:vim82rt.tar + tar xf t:vim90bin.tar + tar xf t:vim90rt.tar Set the $VIM environment variable to point to the top directory of your Vim files. For the above example: diff --git a/READMEdir/README_amibin.txt b/READMEdir/README_amibin.txt index 962567d58f..2e36b32940 100644 --- a/READMEdir/README_amibin.txt +++ b/READMEdir/README_amibin.txt @@ -1,8 +1,8 @@ -README_amibin.txt for version 8.2 of Vim: Vi IMproved. +README_amibin.txt for version 9.0 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_ami.txt" for installation instructions for the Amiga. -These files are in the runtime archive (vim82rt.tgz). +These files are in the runtime archive (vim90rt.tgz). The Amiga "bin" archive contains the Vim executable for the Amiga. It was diff --git a/READMEdir/README_amisrc.txt b/READMEdir/README_amisrc.txt index 6c4f76cf4b..e014a1d0ac 100644 --- a/READMEdir/README_amisrc.txt +++ b/READMEdir/README_amisrc.txt @@ -1,8 +1,8 @@ -README_amisrc.txt for version 8.2 of Vim: Vi IMproved. +README_amisrc.txt for version 9.0 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_ami.txt" for installation instructions for the Amiga. -These files are in the runtime archive (vim82rt.tgz). +These files are in the runtime archive (vim90rt.tgz). The Amiga source archive contains the files needed to compile Vim on the diff --git a/READMEdir/README_bindos.txt b/READMEdir/README_bindos.txt index d16c8d8002..dcece08405 100644 --- a/READMEdir/README_bindos.txt +++ b/READMEdir/README_bindos.txt @@ -1,16 +1,16 @@ -README_bindos.txt for version 8.2 of Vim: Vi IMproved. +README_bindos.txt for version 9.0 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. -These files are in the runtime archive (vim82rt.zip). +These files are in the runtime archive (vim90rt.zip). There are several binary distributions of Vim for the PC. You would normally pick only one of them, but it's also possible to install several. These ones are available (the version number may differ): - vim82w32.zip Windows 95/98/NT/etc. console version - gvim82.zip Windows 95/98/NT/etc. GUI version - gvim82ole.zip Windows 95/98/NT/etc. GUI version with OLE + vim90w32.zip Windows 95/98/NT/etc. console version + gvim90.zip Windows 95/98/NT/etc. GUI version + gvim90ole.zip Windows 95/98/NT/etc. GUI version with OLE -You MUST also get the runtime archive (vim82rt.zip). -The sources are also available (vim82src.zip). +You MUST also get the runtime archive (vim90rt.zip). +The sources are also available (vim90src.zip). diff --git a/READMEdir/README_dos.txt b/READMEdir/README_dos.txt index 3f086121bc..73b70a668d 100644 --- a/READMEdir/README_dos.txt +++ b/READMEdir/README_dos.txt @@ -1,4 +1,4 @@ -README_dos.txt for version 8.2 of Vim: Vi IMproved. +README_dos.txt for version 9.0 of Vim: Vi IMproved. This file explains the installation of Vim on MS-Windows systems. See "README.txt" for general information about Vim. @@ -41,19 +41,19 @@ These are the normal steps to install Vim from the .zip archives: located. Check the $VIM setting to see where it points to: set VIM For example, if you have - C:\vim\vim82 + C:\vim\vim90 do cd C:\ Binary and runtime Vim archives are normally unpacked in the same location, on top of each other. -2. Unpack the zip archives. This will create a new directory "vim\vim82", +2. Unpack the zip archives. This will create a new directory "vim\vim90", in which all the distributed Vim files are placed. Since the directory name includes the version number, it is unlikely that you overwrite existing files. Examples: - pkunzip -d gvim82.zip - unzip vim82w32.zip + pkunzip -d gvim90.zip + unzip vim90w32.zip You need to unpack the runtime archive and at least one of the binary archives. When using more than one binary version, be careful not to @@ -65,7 +65,7 @@ These are the normal steps to install Vim from the .zip archives: won't move or copy the runtime files. 3. Change to the new directory: - cd vim\vim82 + cd vim\vim90 Run the "install.exe" program. It will ask you a number of questions about how you would like to have your Vim setup. Among these are: - You can tell it to write a "_vimrc" file with your preferences in the @@ -76,8 +76,8 @@ These are the normal steps to install Vim from the .zip archives: console or in a shell. You can select one of the directories in your $PATH. If you skip this, you can add Vim to the search path manually: The simplest is to add a line to your autoexec.bat. Examples: - set path=%path%;C:\vim\vim82 - set path=%path%;D:\editors\vim\vim82 + set path=%path%;C:\vim\vim90 + set path=%path%;D:\editors\vim\vim90 - Create entries for Vim on the desktop and in the Start menu. That's it! @@ -89,8 +89,8 @@ Remarks: won't show a menubar. Then you need to set the $VIM environment variable to point to the top directory of your Vim files. Example: set VIM=C:\editors\vim - Vim version 8.2 will look for your vimrc file in $VIM, and for the runtime - files in $VIM/vim82. See ":help $VIM" for more information. + Vim version 9.0 will look for your vimrc file in $VIM, and for the runtime + files in $VIM/vim90. See ":help $VIM" for more information. - To avoid confusion between distributed files of different versions and your own modified vim scripts, it is recommended to use this directory layout: @@ -101,14 +101,14 @@ Remarks: C:\vim\vimfiles\ftplugin\*.vim Filetype plugins C:\vim\... Other files you made. Distributed files: - C:\vim\vim82\vim.exe The Vim version 8.2 executable. - C:\vim\vim82\doc\*.txt The version 8.2 documentation files. - C:\vim\vim82\bugreport.vim A Vim version 8.2 script. - C:\vim\vim82\... Other version 8.2 distributed files. + C:\vim\vim90\vim.exe The Vim version 9.0 executable. + C:\vim\vim90\doc\*.txt The version 9.0 documentation files. + C:\vim\vim90\bugreport.vim A Vim version 9.0 script. + C:\vim\vim90\... Other version 9.0 distributed files. In this case the $VIM environment variable would be set like this: set VIM=C:\vim - Then $VIMRUNTIME will automatically be set to "$VIM\vim82". Don't add - "vim82" to $VIM, that won't work. + Then $VIMRUNTIME will automatically be set to "$VIM\vim90". Don't add + "vim90" to $VIM, that won't work. - You can put your Vim executable anywhere else. If the executable is not with the other Vim files, you should set $VIM. The simplest is to add a line @@ -132,8 +132,8 @@ Remarks: Select Properties. 5. In the Program tab, change the "Cmdline" to add "/c" and the name of the Vim executable. Examples: - C:\command.com /c C:\vim\vim82\vim.exe - C:\command.com /c D:\editors\vim\vim82\vim.exe + C:\command.com /c C:\vim\vim90\vim.exe + C:\command.com /c D:\editors\vim\vim90\vim.exe 6. Select the font, window size, etc. that you like. If this isn't possible, select "Advanced" in the Program tab, and deselect "MS-DOS mode". diff --git a/READMEdir/README_extra.txt b/READMEdir/README_extra.txt index d61b25c2e0..0040ae94ad 100644 --- a/READMEdir/README_extra.txt +++ b/READMEdir/README_extra.txt @@ -1,4 +1,4 @@ -README_extra.txt for version 8.2 of Vim: Vi IMproved. +README_extra.txt for version 9.0 of Vim: Vi IMproved. These extra files of Vim are for special purposes. This README explains what the files are for. For general information about Vim, see the "README.txt" diff --git a/READMEdir/README_haiku.txt b/READMEdir/README_haiku.txt index 860b40b0d7..b8bcd75b95 100644 --- a/READMEdir/README_haiku.txt +++ b/READMEdir/README_haiku.txt @@ -1,4 +1,4 @@ -README_haiku.txt for version 8.2 of Vim: Vi IMproved. +README_haiku.txt for version 9.0 of Vim: Vi IMproved. This file explains the installation of Vim on Haiku operating system. See "README.txt" for general information about Vim. diff --git a/READMEdir/README_mac.txt b/READMEdir/README_mac.txt index 22f961f921..b325238b63 100644 --- a/READMEdir/README_mac.txt +++ b/READMEdir/README_mac.txt @@ -1,4 +1,4 @@ -README_mac.txt for version 8.2 of Vim: Vi IMproved. +README_mac.txt for version 9.0 of Vim: Vi IMproved. How to install MacVim? ======================== diff --git a/READMEdir/README_ole.txt b/READMEdir/README_ole.txt index 839dd6aeef..b45a0c2de2 100644 --- a/READMEdir/README_ole.txt +++ b/READMEdir/README_ole.txt @@ -1,4 +1,4 @@ -README_ole.txt for version 8.2 of Vim: Vi IMproved. +README_ole.txt for version 9.0 of Vim: Vi IMproved. This archive contains gvim.exe with OLE interface and VisVim. This version of gvim.exe can also load a number of interface dynamically (you diff --git a/READMEdir/README_os2.txt b/READMEdir/README_os2.txt index 3a9cdf14c0..19b6a53606 100644 --- a/READMEdir/README_os2.txt +++ b/READMEdir/README_os2.txt @@ -1,4 +1,4 @@ -README_os2.txt for version 8.2 of Vim: Vi IMproved. +README_os2.txt for version 9.0 of Vim: Vi IMproved. This file used to explain the installation of Vim on OS/2 systems. However, support for OS/2 has been removed in patch 7.4.1008. diff --git a/READMEdir/README_os390.txt b/READMEdir/README_os390.txt index 360149532c..87db0b4ec4 100644 --- a/READMEdir/README_os390.txt +++ b/READMEdir/README_os390.txt @@ -1,4 +1,4 @@ -README_os390.txt for version 8.2 of Vim: Vi IMproved. +README_os390.txt for version 9.0 of Vim: Vi IMproved. This readme explains how to build Vim on z/OS. Formerly called OS/390. See "README.txt" for general information about Vim. diff --git a/READMEdir/README_src.txt b/READMEdir/README_src.txt index 935830fe98..96a94dbd12 100644 --- a/READMEdir/README_src.txt +++ b/READMEdir/README_src.txt @@ -1,8 +1,8 @@ -README_src.txt for version 8.2 of Vim: Vi IMproved. +README_src.txt for version 9.0 of Vim: Vi IMproved. The source archive contains the files needed to compile Vim on Unix systems. It is packed for Unix systems (NL line separator). For more information, see the README.txt file that comes with the runtime -archive (vim-8.2-rt.tar.gz). To be able to run Vim you MUST get the runtime +archive (vim-9.0-rt.tar.gz). To be able to run Vim you MUST get the runtime archive too! diff --git a/READMEdir/README_srcdos.txt b/READMEdir/README_srcdos.txt index ca016bd729..2bef9deb9b 100644 --- a/READMEdir/README_srcdos.txt +++ b/READMEdir/README_srcdos.txt @@ -1,8 +1,8 @@ -README_srcdos.txt for version 8.2 of Vim: Vi IMproved. +README_srcdos.txt for version 9.0 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-Windows. -These files are in the runtime archive (vim82rt.zip). +These files are in the runtime archive (vim90rt.zip). The DOS source archive contains the files needed to compile Vim on MS-Windows. diff --git a/READMEdir/README_unix.txt b/READMEdir/README_unix.txt index 4ed11f01d4..9222a5de89 100644 --- a/READMEdir/README_unix.txt +++ b/READMEdir/README_unix.txt @@ -1,4 +1,4 @@ -README_unix.txt for version 8.2 of Vim: Vi IMproved. +README_unix.txt for version 9.0 of Vim: Vi IMproved. This file explains the installation of Vim on Unix systems. See "README.txt" for general information about Vim. diff --git a/READMEdir/README_vms.txt b/READMEdir/README_vms.txt index d38fa983ed..f55c7c01e3 100644 --- a/READMEdir/README_vms.txt +++ b/READMEdir/README_vms.txt @@ -1,4 +1,4 @@ -README_vms.txt for version 8.2 of Vim: Vi IMproved. +README_vms.txt for version 9.0 of Vim: Vi IMproved. This file explains the installation of Vim on VMS systems. See "README.txt" in the runtime archive for information about Vim. diff --git a/READMEdir/README_w32s.txt b/READMEdir/README_w32s.txt index 742a6551ba..a65f1c9ef7 100644 --- a/READMEdir/README_w32s.txt +++ b/READMEdir/README_w32s.txt @@ -1,4 +1,4 @@ -README_w32s.txt for version 8.2 of Vim: Vi IMproved. +README_w32s.txt for version 9.0 of Vim: Vi IMproved. This file used to explain the installation of Vim on MS-Windows 3.1 and 3.11 systems. However, support for MS-Windows 3.1 and 3.11 has been removed in diff --git a/nsis/gvim_version.nsh b/nsis/gvim_version.nsh index 92a77866eb..d8639a6bc8 100644 --- a/nsis/gvim_version.nsh +++ b/nsis/gvim_version.nsh @@ -1,6 +1,6 @@ # Generated from Makefile: define the version numbers !ifndef __GVIM_VER__NSH__ !define __GVIM_VER__NSH__ -!define VER_MAJOR 8 -!define VER_MINOR 2 +!define VER_MAJOR 9 +!define VER_MINOR 0 !endif diff --git a/runtime/bitmaps/vim.ico b/runtime/bitmaps/vim.ico deleted file mode 100644 index 6e998b7e2b..0000000000 Binary files a/runtime/bitmaps/vim.ico and /dev/null differ diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt index 28e203836e..ff1cac4350 100644 --- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -1,4 +1,4 @@ -*arabic.txt* For Vim version 8.2. Last change: 2021 Jun 22 +*arabic.txt* For Vim version 9.0. Last change: 2021 Jun 22 VIM REFERENCE MANUAL by Nadim Shaikli diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index a4ced345b0..8d44136b45 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 8.2. Last change: 2022 May 24 +*autocmd.txt* For Vim version 9.0. Last change: 2022 May 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 5f37c742e9..c93da54c26 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -1,4 +1,4 @@ -*builtin.txt* For Vim version 8.2. Last change: 2022 Jun 17 +*builtin.txt* For Vim version 9.0. Last change: 2022 Jun 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1120,10 +1120,10 @@ balloon_show({expr}) *balloon_show()* is initiated from 'balloonexpr'. It will invoke an asynchronous method, in which a callback invokes balloon_show(). The 'balloonexpr' itself can return an - empty string or a placeholder. + empty string or a placeholder, e.g. "loading...". - When showing a balloon is not possible nothing happens, no - error message. + When showing a balloon is not possible then nothing happens, + no error message is given. {only available when compiled with the |+balloon_eval| or |+balloon_eval_term| feature} @@ -6935,7 +6935,7 @@ reltime([{start} [, {end}]]) *reltime()* string or |reltimefloat()| to convert to a Float. Without an argument reltime() returns the current time (the - representation is system-dependend, it can not be used as the + representation is system-dependent, it can not be used as the wall-clock time, see |localtime()| for that). With one argument is returns the time passed since the time specified in the argument. diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 074d9706f2..27ce88b346 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 8.2. Last change: 2022 May 26 +*change.txt* For Vim version 9.0. Last change: 2022 May 26 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt index b7ae4d4300..65dbd30f9b 100644 --- a/runtime/doc/channel.txt +++ b/runtime/doc/channel.txt @@ -1,4 +1,4 @@ -*channel.txt* For Vim version 8.2. Last change: 2022 Jun 23 +*channel.txt* For Vim version 9.0. Last change: 2022 Jun 23 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 607eb34038..ffb0832bd4 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 8.2. Last change: 2022 Jun 16 +*cmdline.txt* For Vim version 9.0. Last change: 2022 Jun 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt index f887e82269..6fd88b679a 100644 --- a/runtime/doc/debug.txt +++ b/runtime/doc/debug.txt @@ -1,4 +1,4 @@ -*debug.txt* For Vim version 8.2. Last change: 2019 May 07 +*debug.txt* For Vim version 9.0. Last change: 2019 May 07 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt index a728b8ae3f..5c5c8d33db 100644 --- a/runtime/doc/debugger.txt +++ b/runtime/doc/debugger.txt @@ -1,4 +1,4 @@ -*debugger.txt* For Vim version 8.2. Last change: 2019 Dec 21 +*debugger.txt* For Vim version 9.0. Last change: 2019 Dec 21 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt index e48983b02d..4739a102ae 100644 --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -1,4 +1,4 @@ -*develop.txt* For Vim version 8.2. Last change: 2020 Aug 15 +*develop.txt* For Vim version 9.0. Last change: 2020 Aug 15 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index fad680148a..a66df1e273 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 8.2. Last change: 2022 Jan 22 +*diff.txt* For Vim version 9.0. Last change: 2022 Jan 22 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt index 3610380bee..cd4b30eae4 100644 --- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -1,4 +1,4 @@ -*digraph.txt* For Vim version 8.2. Last change: 2021 Jul 19 +*digraph.txt* For Vim version 9.0. Last change: 2021 Jul 19 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 55543c7df9..0ce48af0d7 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 8.2. Last change: 2022 Apr 16 +*editing.txt* For Vim version 9.0. Last change: 2022 Apr 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 4943e720dc..027765193e 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.2. Last change: 2022 Jun 17 +*eval.txt* For Vim version 9.0. Last change: 2022 Jun 17 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt index b6799cc484..a2afab4fa0 100644 --- a/runtime/doc/farsi.txt +++ b/runtime/doc/farsi.txt @@ -1,4 +1,4 @@ -*farsi.txt* For Vim version 8.2. Last change: 2019 May 05 +*farsi.txt* For Vim version 9.0. Last change: 2019 May 05 VIM REFERENCE MANUAL by Mortaza Ghassab Shiran diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 37f7d61c7f..06eff2da1a 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 8.2. Last change: 2022 Apr 09 +*filetype.txt* For Vim version 9.0. Last change: 2022 Apr 09 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt index cda3902525..93efcbb664 100644 --- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -1,4 +1,4 @@ -*fold.txt* For Vim version 8.2. Last change: 2022 Jan 22 +*fold.txt* For Vim version 9.0. Last change: 2022 Jan 22 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/ft_ada.txt b/runtime/doc/ft_ada.txt index 8645ad9e9e..fe002564e0 100644 --- a/runtime/doc/ft_ada.txt +++ b/runtime/doc/ft_ada.txt @@ -1,4 +1,4 @@ -*ft_ada.txt* For Vim version 8.2. Last change: 2022 Mar 13 +*ft_ada.txt* For Vim version 9.0. Last change: 2022 Mar 13 ADA FILE TYPE PLUG-INS REFERENCE MANUAL~ diff --git a/runtime/doc/ft_rust.txt b/runtime/doc/ft_rust.txt index d2fc6ddc8d..d5f4080aa5 100644 --- a/runtime/doc/ft_rust.txt +++ b/runtime/doc/ft_rust.txt @@ -1,4 +1,4 @@ -*ft_rust.txt* For Vim version 8.2. Last change: 2017 Nov 02 +*ft_rust.txt* For Vim version 9.0. Last change: 2017 Nov 02 This is documentation for the Rust filetype plugin. diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt index dde456aa43..73d619c5d0 100644 --- a/runtime/doc/ft_sql.txt +++ b/runtime/doc/ft_sql.txt @@ -1,4 +1,4 @@ -*ft_sql.txt* For Vim version 8.2. Last change: 2022 Apr 06 +*ft_sql.txt* For Vim version 9.0. Last change: 2022 Apr 06 by David Fishburn diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index e54dcdaa92..8a63bef9c6 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 8.2. Last change: 2022 Apr 03 +*gui.txt* For Vim version 9.0. Last change: 2022 Apr 03 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt index 93f68bd3d3..c9e04f3bee 100644 --- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -1,4 +1,4 @@ -*gui_w32.txt* For Vim version 8.2. Last change: 2022 Mar 09 +*gui_w32.txt* For Vim version 9.0. Last change: 2022 Mar 09 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index ccc5ea721e..76606ed636 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 8.2. Last change: 2022 Apr 03 +*gui_x11.txt* For Vim version 9.0. Last change: 2022 Apr 03 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt index 9357bc8793..76db5b2497 100644 --- a/runtime/doc/hangulin.txt +++ b/runtime/doc/hangulin.txt @@ -1,4 +1,4 @@ -*hangulin.txt* For Vim version 8.2. Last change: 2019 Nov 21 +*hangulin.txt* For Vim version 9.0. Last change: 2019 Nov 21 VIM REFERENCE MANUAL by Chi-Deok Hwang and Sung-Hyun Nam diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt index 62689e2ba5..2644f81a50 100644 --- a/runtime/doc/hebrew.txt +++ b/runtime/doc/hebrew.txt @@ -1,4 +1,4 @@ -*hebrew.txt* For Vim version 8.2. Last change: 2019 May 05 +*hebrew.txt* For Vim version 9.0. Last change: 2019 May 05 VIM REFERENCE MANUAL by Ron Aaron (and Avner Lottem) diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index e31bd9e00a..0091cb34c8 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -1,4 +1,4 @@ -*help.txt* For Vim version 8.2. Last change: 2022 May 13 +*help.txt* For Vim version 9.0. Last change: 2022 May 13 VIM - main help file k diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt index d01b3daad6..9ea6308069 100644 --- a/runtime/doc/helphelp.txt +++ b/runtime/doc/helphelp.txt @@ -1,4 +1,4 @@ -*helphelp.txt* For Vim version 8.2. Last change: 2022 Jan 08 +*helphelp.txt* For Vim version 9.0. Last change: 2022 Jan 08 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/howto.txt b/runtime/doc/howto.txt index 1b10025030..75169a99be 100644 --- a/runtime/doc/howto.txt +++ b/runtime/doc/howto.txt @@ -1,4 +1,4 @@ -*howto.txt* For Vim version 8.2. Last change: 2006 Apr 02 +*howto.txt* For Vim version 9.0. Last change: 2006 Apr 02 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt index ea84869abd..8f98161e79 100644 --- a/runtime/doc/if_cscop.txt +++ b/runtime/doc/if_cscop.txt @@ -1,4 +1,4 @@ -*if_cscop.txt* For Vim version 8.2. Last change: 2022 Jan 08 +*if_cscop.txt* For Vim version 9.0. Last change: 2022 Jan 08 VIM REFERENCE MANUAL by Andy Kahn diff --git a/runtime/doc/if_lua.txt b/runtime/doc/if_lua.txt index 00b51a8f69..63ee91aee0 100644 --- a/runtime/doc/if_lua.txt +++ b/runtime/doc/if_lua.txt @@ -1,4 +1,4 @@ -*if_lua.txt* For Vim version 8.2. Last change: 2021 Aug 06 +*if_lua.txt* For Vim version 9.0. Last change: 2021 Aug 06 VIM REFERENCE MANUAL by Luis Carvalho diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt index f0de21a91b..9e9b252e76 100644 --- a/runtime/doc/if_mzsch.txt +++ b/runtime/doc/if_mzsch.txt @@ -1,4 +1,4 @@ -*if_mzsch.txt* For Vim version 8.2. Last change: 2020 Oct 14 +*if_mzsch.txt* For Vim version 9.0. Last change: 2020 Oct 14 VIM REFERENCE MANUAL by Sergey Khorev diff --git a/runtime/doc/if_ole.txt b/runtime/doc/if_ole.txt index 8417637653..36d93333e5 100644 --- a/runtime/doc/if_ole.txt +++ b/runtime/doc/if_ole.txt @@ -1,4 +1,4 @@ -*if_ole.txt* For Vim version 8.2. Last change: 2019 Dec 07 +*if_ole.txt* For Vim version 9.0. Last change: 2019 Dec 07 VIM REFERENCE MANUAL by Paul Moore diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt index 61ad7c94b6..281185bb33 100644 --- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -1,4 +1,4 @@ -*if_perl.txt* For Vim version 8.2. Last change: 2022 Mar 13 +*if_perl.txt* For Vim version 9.0. Last change: 2022 Mar 13 VIM REFERENCE MANUAL by Sven Verdoolaege diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index 9cbd35981d..0cf2b0f56b 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -1,4 +1,4 @@ -*if_pyth.txt* For Vim version 8.2. Last change: 2022 Feb 22 +*if_pyth.txt* For Vim version 9.0. Last change: 2022 Feb 22 VIM REFERENCE MANUAL by Paul Moore diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt index dc8349fc44..caecc6d2c9 100644 --- a/runtime/doc/if_ruby.txt +++ b/runtime/doc/if_ruby.txt @@ -1,4 +1,4 @@ -*if_ruby.txt* For Vim version 8.2. Last change: 2019 Jul 21 +*if_ruby.txt* For Vim version 9.0. Last change: 2019 Jul 21 VIM REFERENCE MANUAL by Shugo Maeda diff --git a/runtime/doc/if_sniff.txt b/runtime/doc/if_sniff.txt index de6d8ebf38..27db68871d 100644 --- a/runtime/doc/if_sniff.txt +++ b/runtime/doc/if_sniff.txt @@ -1,4 +1,4 @@ -*if_sniff.txt* For Vim version 8.2. Last change: 2016 Feb 27 +*if_sniff.txt* For Vim version 9.0. Last change: 2016 Feb 27 VIM REFERENCE MANUAL diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt index 99301f362c..7091469ac7 100644 --- a/runtime/doc/if_tcl.txt +++ b/runtime/doc/if_tcl.txt @@ -1,4 +1,4 @@ -*if_tcl.txt* For Vim version 8.2. Last change: 2022 Jan 08 +*if_tcl.txt* For Vim version 9.0. Last change: 2022 Jan 08 VIM REFERENCE MANUAL by Ingo Wilken diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index a0230cadcc..ade9e422cf 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1,4 +1,4 @@ -*indent.txt* For Vim version 8.2. Last change: 2022 May 21 +*indent.txt* For Vim version 9.0. Last change: 2022 May 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index dde0ef6402..aa233ee92c 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 8.2. Last change: 2022 Jun 11 +*index.txt* For Vim version 9.0. Last change: 2022 Jun 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 8c35798391..b376af700b 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 8.2. Last change: 2022 Apr 06 +*insert.txt* For Vim version 9.0. Last change: 2022 Apr 06 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 9feb5b73e4..2ac98b1fac 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 8.2. Last change: 2022 Apr 03 +*intro.txt* For Vim version 9.0. Last change: 2022 Apr 03 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index 91261050d6..ee9a61309f 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 8.2. Last change: 2022 Jun 18 +*map.txt* For Vim version 9.0. Last change: 2022 Jun 18 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 74bd24d512..81d391c3e5 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 8.2. Last change: 2022 Apr 03 +*mbyte.txt* For Vim version 9.0. Last change: 2022 Apr 03 VIM REFERENCE MANUAL by Bram Moolenaar et al. diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 962c86cf97..805fc37dd3 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 8.2. Last change: 2022 Jan 26 +*message.txt* For Vim version 9.0. Last change: 2022 Jan 26 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt index a79250ad3e..edab4d43ce 100644 --- a/runtime/doc/mlang.txt +++ b/runtime/doc/mlang.txt @@ -1,4 +1,4 @@ -*mlang.txt* For Vim version 8.2. Last change: 2020 Aug 15 +*mlang.txt* For Vim version 9.0. Last change: 2020 Aug 15 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 61469dead8..4cd1a32b4c 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 8.2. Last change: 2022 Apr 18 +*motion.txt* For Vim version 9.0. Last change: 2022 Apr 18 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt index 7f69376914..241fdb70be 100644 --- a/runtime/doc/netbeans.txt +++ b/runtime/doc/netbeans.txt @@ -1,4 +1,4 @@ -*netbeans.txt* For Vim version 8.2. Last change: 2022 Apr 03 +*netbeans.txt* For Vim version 9.0. Last change: 2022 Apr 03 VIM REFERENCE MANUAL by Gordon Prieur et al. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index c27d896892..1bac4c4d7c 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.2. Last change: 2022 Jun 23 +*options.txt* For Vim version 9.0. Last change: 2022 Jun 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5184,8 +5184,9 @@ A jump table for the options with a short description can be found at |Q_op|. :set listchars+=tab:>-,lead:. < *lcs-leadmultispace* leadmultispace:c... - Like multispace value, but only for leading whitespace - overrides |lcs-lead| for leading multiple spaces. + Like the |lcs-multispace| value, but for leading + spaces only. Also overrides |lcs-lead| for leading + multiple spaces. `:set listchars=leadmultispace:---+` shows ten consecutive leading spaces as: ---+---+--XXX ~ diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt index fc1c3381f6..8dce4a56e0 100644 --- a/runtime/doc/os_390.txt +++ b/runtime/doc/os_390.txt @@ -1,4 +1,4 @@ -*os_390.txt* For Vim version 8.2. Last change: 2019 Dec 07 +*os_390.txt* For Vim version 9.0. Last change: 2019 Dec 07 VIM REFERENCE MANUAL by Ralf Schandl diff --git a/runtime/doc/os_amiga.txt b/runtime/doc/os_amiga.txt index cbfdd6c236..062ad3b2e7 100644 --- a/runtime/doc/os_amiga.txt +++ b/runtime/doc/os_amiga.txt @@ -1,4 +1,4 @@ -*os_amiga.txt* For Vim version 8.2. Last change: 2010 Aug 14 +*os_amiga.txt* For Vim version 9.0. Last change: 2010 Aug 14 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_beos.txt b/runtime/doc/os_beos.txt index 906c5891dc..8a2ac487be 100644 --- a/runtime/doc/os_beos.txt +++ b/runtime/doc/os_beos.txt @@ -1,4 +1,4 @@ -*os_beos.txt* For Vim version 8.2. Last change: 2020 Jun 07 +*os_beos.txt* For Vim version 9.0. Last change: 2020 Jun 07 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt index b315be8a1b..e5e405caf4 100644 --- a/runtime/doc/os_dos.txt +++ b/runtime/doc/os_dos.txt @@ -1,4 +1,4 @@ -*os_dos.txt* For Vim version 8.2. Last change: 2006 Mar 30 +*os_dos.txt* For Vim version 9.0. Last change: 2006 Mar 30 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_haiku.txt b/runtime/doc/os_haiku.txt index a22b99bf43..be08b4a319 100644 --- a/runtime/doc/os_haiku.txt +++ b/runtime/doc/os_haiku.txt @@ -1,4 +1,4 @@ -*os_haiku.txt* For Vim version 8.2. Last change: 2020 May 13 +*os_haiku.txt* For Vim version 9.0. Last change: 2020 May 13 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt index c0fe1b1e3a..5d1f38c7d9 100644 --- a/runtime/doc/os_mac.txt +++ b/runtime/doc/os_mac.txt @@ -1,4 +1,4 @@ -*os_mac.txt* For Vim version 8.2. Last change: 2019 Apr 21 +*os_mac.txt* For Vim version 9.0. Last change: 2019 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar et al. diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt index d8b516fa56..4273c55012 100644 --- a/runtime/doc/os_mint.txt +++ b/runtime/doc/os_mint.txt @@ -1,4 +1,4 @@ -*os_mint.txt* For Vim version 8.2. Last change: 2020 Jul 14 +*os_mint.txt* For Vim version 9.0. Last change: 2020 Jul 14 VIM REFERENCE MANUAL by Jens M. Felderhoff diff --git a/runtime/doc/os_msdos.txt b/runtime/doc/os_msdos.txt index ea3842c5c4..67821ed474 100644 --- a/runtime/doc/os_msdos.txt +++ b/runtime/doc/os_msdos.txt @@ -1,4 +1,4 @@ -*os_msdos.txt* For Vim version 8.2. Last change: 2016 Feb 26 +*os_msdos.txt* For Vim version 9.0. Last change: 2016 Feb 26 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_os2.txt b/runtime/doc/os_os2.txt index 691a7953d5..a07767ef90 100644 --- a/runtime/doc/os_os2.txt +++ b/runtime/doc/os_os2.txt @@ -1,4 +1,4 @@ -*os_os2.txt* For Vim version 8.2. Last change: 2015 Dec 31 +*os_os2.txt* For Vim version 9.0. Last change: 2015 Dec 31 VIM REFERENCE MANUAL by Paul Slootman diff --git a/runtime/doc/os_qnx.txt b/runtime/doc/os_qnx.txt index 45381e1f98..ade1c7a56f 100644 --- a/runtime/doc/os_qnx.txt +++ b/runtime/doc/os_qnx.txt @@ -1,4 +1,4 @@ -*os_qnx.txt* For Vim version 8.2. Last change: 2005 Mar 29 +*os_qnx.txt* For Vim version 9.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Julian Kinraid diff --git a/runtime/doc/os_risc.txt b/runtime/doc/os_risc.txt index 18f58d4202..92af8cd6bc 100644 --- a/runtime/doc/os_risc.txt +++ b/runtime/doc/os_risc.txt @@ -1,4 +1,4 @@ -*os_risc.txt* For Vim version 8.2. Last change: 2011 May 10 +*os_risc.txt* For Vim version 9.0. Last change: 2011 May 10 VIM REFERENCE MANUAL by Thomas Leonard diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt index fa49db8750..0b0f389bc3 100644 --- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -1,4 +1,4 @@ -*os_unix.txt* For Vim version 8.2. Last change: 2005 Mar 29 +*os_unix.txt* For Vim version 9.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt index 8637637793..c55b0e68e4 100644 --- a/runtime/doc/os_vms.txt +++ b/runtime/doc/os_vms.txt @@ -1,4 +1,4 @@ -*os_vms.txt* For Vim version 8.2. Last change: 2021 Jan 04 +*os_vms.txt* For Vim version 9.0. Last change: 2021 Jan 04 VIM REFERENCE MANUAL diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt index 53a4d03ed4..0eb065f72f 100644 --- a/runtime/doc/os_win32.txt +++ b/runtime/doc/os_win32.txt @@ -1,4 +1,4 @@ -*os_win32.txt* For Vim version 8.2. Last change: 2022 May 24 +*os_win32.txt* For Vim version 9.0. Last change: 2022 May 24 VIM REFERENCE MANUAL by George Reilly diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 50fd53c853..d5e9915931 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 8.2. Last change: 2022 Mar 04 +*pattern.txt* For Vim version 9.0. Last change: 2022 Mar 04 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pi_getscript.txt b/runtime/doc/pi_getscript.txt index 980507dc7a..87d4a4a846 100644 --- a/runtime/doc/pi_getscript.txt +++ b/runtime/doc/pi_getscript.txt @@ -1,4 +1,4 @@ -*pi_getscript.txt* For Vim version 8.2. Last change: 2017 Aug 01 +*pi_getscript.txt* For Vim version 9.0. Last change: 2017 Aug 01 > GETSCRIPT REFERENCE MANUAL by Charles E. Campbell < diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt index 19e73871cd..e5d5ffb25f 100644 --- a/runtime/doc/pi_gzip.txt +++ b/runtime/doc/pi_gzip.txt @@ -1,4 +1,4 @@ -*pi_gzip.txt* For Vim version 8.2. Last change: 2019 May 05 +*pi_gzip.txt* For Vim version 9.0. Last change: 2019 May 05 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 6f966068f2..2b1897fe10 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 8.2. Last change: 2022 Apr 06 +*pi_netrw.txt* For Vim version 9.0. Last change: 2022 Apr 06 ------------------------------------------------ NETRW REFERENCE MANUAL by Charles E. Campbell diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt index 773eccb6d4..9af0e9c951 100644 --- a/runtime/doc/pi_paren.txt +++ b/runtime/doc/pi_paren.txt @@ -1,4 +1,4 @@ -*pi_paren.txt* For Vim version 8.2. Last change: 2013 May 08 +*pi_paren.txt* For Vim version 9.0. Last change: 2013 May 08 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pi_spec.txt b/runtime/doc/pi_spec.txt index 35b2210b22..27d60b8feb 100644 --- a/runtime/doc/pi_spec.txt +++ b/runtime/doc/pi_spec.txt @@ -1,4 +1,4 @@ -*pi_spec.txt* For Vim version 8.2. Last change: 2006 Apr 24 +*pi_spec.txt* For Vim version 9.0. Last change: 2006 Apr 24 by Gustavo Niemeyer ~ diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt index c6c0596ea0..7b1c7db2af 100644 --- a/runtime/doc/pi_tar.txt +++ b/runtime/doc/pi_tar.txt @@ -1,4 +1,4 @@ -*pi_tar.txt* For Vim version 8.2. Last change: 2020 Jan 07 +*pi_tar.txt* For Vim version 9.0. Last change: 2020 Jan 07 +====================+ | Tar File Interface | diff --git a/runtime/doc/pi_vimball.txt b/runtime/doc/pi_vimball.txt index e16a338313..045c5c4f8d 100644 --- a/runtime/doc/pi_vimball.txt +++ b/runtime/doc/pi_vimball.txt @@ -1,4 +1,4 @@ -*pi_vimball.txt* For Vim version 8.2. Last change: 2016 Apr 11 +*pi_vimball.txt* For Vim version 9.0. Last change: 2016 Apr 11 ---------------- Vimball Archiver diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt index 787ca4d2db..d5a71b77a4 100644 --- a/runtime/doc/pi_zip.txt +++ b/runtime/doc/pi_zip.txt @@ -1,4 +1,4 @@ -*pi_zip.txt* For Vim version 8.2. Last change: 2021 Nov 08 +*pi_zip.txt* For Vim version 9.0. Last change: 2021 Nov 08 +====================+ | Zip File Interface | diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt index 84e02b9e4d..6a2471acf2 100644 --- a/runtime/doc/popup.txt +++ b/runtime/doc/popup.txt @@ -1,4 +1,4 @@ -*popup.txt* For Vim version 8.2. Last change: 2022 Jun 16 +*popup.txt* For Vim version 9.0. Last change: 2022 Jun 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index 691e2b6540..2774e981f6 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -1,4 +1,4 @@ -*print.txt* For Vim version 8.2. Last change: 2022 Jan 23 +*print.txt* For Vim version 9.0. Last change: 2022 Jan 23 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 2a077d98f4..0db6407026 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 8.2. Last change: 2022 Feb 22 +*quickfix.txt* For Vim version 9.0. Last change: 2022 Feb 22 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 5b9cf5a06c..57669bdd63 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 8.2. Last change: 2022 May 05 +*quickref.txt* For Vim version 9.0. Last change: 2022 May 05 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt index 554e8af405..181682d448 100644 --- a/runtime/doc/quotes.txt +++ b/runtime/doc/quotes.txt @@ -1,4 +1,4 @@ -*quotes.txt* For Vim version 8.2. Last change: 2018 Mar 29 +*quotes.txt* For Vim version 9.0. Last change: 2018 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt index c8f3d8f4ce..db58241a35 100644 --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -1,4 +1,4 @@ -*recover.txt* For Vim version 8.2. Last change: 2020 Aug 15 +*recover.txt* For Vim version 9.0. Last change: 2020 Aug 15 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt index 1d851e3c87..972c75ef92 100644 --- a/runtime/doc/remote.txt +++ b/runtime/doc/remote.txt @@ -1,4 +1,4 @@ -*remote.txt* For Vim version 8.2. Last change: 2022 Feb 17 +*remote.txt* For Vim version 9.0. Last change: 2022 Feb 17 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index e9816bc0a2..d0d9c35da6 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 8.2. Last change: 2022 Jun 18 +*repeat.txt* For Vim version 9.0. Last change: 2022 Jun 18 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt index 1d4fb3565b..7c5a60a5ae 100644 --- a/runtime/doc/rileft.txt +++ b/runtime/doc/rileft.txt @@ -1,4 +1,4 @@ -*rileft.txt* For Vim version 8.2. Last change: 2022 Apr 03 +*rileft.txt* For Vim version 9.0. Last change: 2022 Apr 03 VIM REFERENCE MANUAL by Avner Lottem diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt index b687421d81..4e8c5ed5c9 100644 --- a/runtime/doc/russian.txt +++ b/runtime/doc/russian.txt @@ -1,4 +1,4 @@ -*russian.txt* For Vim version 8.2. Last change: 2006 Apr 24 +*russian.txt* For Vim version 9.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Vassily Ragosin diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt index 8035d3cfd9..d43ecb28ac 100644 --- a/runtime/doc/scroll.txt +++ b/runtime/doc/scroll.txt @@ -1,4 +1,4 @@ -*scroll.txt* For Vim version 8.2. Last change: 2022 May 07 +*scroll.txt* For Vim version 9.0. Last change: 2022 May 07 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index ace84bde53..c366ae5f59 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 8.2. Last change: 2021 Dec 05 +*sign.txt* For Vim version 9.0. Last change: 2021 Dec 05 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 3e20380c45..a7e0e7e414 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 8.2. Last change: 2020 Aug 15 +*spell.txt* For Vim version 9.0. Last change: 2020 Aug 15 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt index 77466094f9..51d6c16024 100644 --- a/runtime/doc/sponsor.txt +++ b/runtime/doc/sponsor.txt @@ -1,4 +1,4 @@ -*sponsor.txt* For Vim version 8.2. Last change: 2022 May 26 +*sponsor.txt* For Vim version 9.0. Last change: 2022 May 26 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 1916d3ece5..8f87ea9dd6 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 8.2. Last change: 2022 Jun 14 +*starting.txt* For Vim version 9.0. Last change: 2022 Jun 14 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 3fbc003e82..e718e23c36 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 8.2. Last change: 2022 Jun 10 +*syntax.txt* For Vim version 9.0. Last change: 2022 Jun 10 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index c0744f669c..54ac11e17a 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 8.2. Last change: 2022 Feb 02 +*tabpage.txt* For Vim version 9.0. Last change: 2022 Feb 02 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index e2391190ec..4c49e44d02 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -1,4 +1,4 @@ -*tagsrch.txt* For Vim version 8.2. Last change: 2020 Dec 19 +*tagsrch.txt* For Vim version 9.0. Last change: 2020 Dec 19 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index 50bfa50202..f103405728 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -1,4 +1,4 @@ -*term.txt* For Vim version 8.2. Last change: 2022 Apr 23 +*term.txt* For Vim version 9.0. Last change: 2022 Apr 23 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt index 463ab26d7e..81dd7c6784 100644 --- a/runtime/doc/terminal.txt +++ b/runtime/doc/terminal.txt @@ -1,4 +1,4 @@ -*terminal.txt* For Vim version 8.2. Last change: 2022 Jun 09 +*terminal.txt* For Vim version 9.0. Last change: 2022 Jun 09 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt index 42246c049b..1252ce3081 100644 --- a/runtime/doc/testing.txt +++ b/runtime/doc/testing.txt @@ -1,4 +1,4 @@ -*testing.txt* For Vim version 8.2. Last change: 2022 May 16 +*testing.txt* For Vim version 9.0. Last change: 2022 May 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt index ed0fa5ef24..fc71bb4c2e 100644 --- a/runtime/doc/textprop.txt +++ b/runtime/doc/textprop.txt @@ -1,4 +1,4 @@ -*textprop.txt* For Vim version 8.2. Last change: 2021 Nov 23 +*textprop.txt* For Vim version 9.0. Last change: 2021 Nov 23 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt index 3c341febc0..5c0d205a21 100644 --- a/runtime/doc/tips.txt +++ b/runtime/doc/tips.txt @@ -1,4 +1,4 @@ -*tips.txt* For Vim version 8.2. Last change: 2021 Nov 06 +*tips.txt* For Vim version 9.0. Last change: 2021 Nov 06 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 37dc6d4ae0..896be454a1 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.2. Last change: 2022 Jun 26 +*todo.txt* For Vim version 9.0. Last change: 2022 Jun 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -602,39 +602,6 @@ Should we include some part of pull request #4505, not increment changedtick in some cases? E.g. for ":write" when the changed flag was already off, the buffer didn't change at all. -Session file contains absolute paths when "curdir" is removed form -'sessionoptions', making it impossible to have a session with a relative path. -(#4450) - -Session file only contains local option values for buffers that are in a -window, not other buffers. (#7532) - -Script generated by :mksession does not work well if there are windows with -modified buffers - change "silent only" into "silent only!" - change "edit fname" of first buffer to "hide edit fname" - skip "badd fname" if "fname" is already in the buffer list - remove remark about unloading buffers from documentation - -When session file has name in argument list but the buffer was deleted, the -buffer is not deleted when using the session file. (#1393) -Should add the buffer in hidden state. - -When a session file is created and there are "nofile" buffers, these are not -filled. Need to trigger BufReadCmd autocommands. Also handle deleting the -initial empty buffer better. (ZyX, 2015 March 8) - -Setting the spell file in a session only reads the local additions, not the -normal spell file. (Enno Nagel, 2014 Mar 29) - -Directory wrong in session file, caused by ":lcd" in BufEnter autocommand. -(Felix Kater, 2009 Mar 3) - -Something wrong with session that has "cd" commands and "badd", in such a way -that Vim doesn't find the edited file in the buffer list, causing the -ATTENTION message? (Tony Mechelynck, 2008 Dec 1) -Also: swap files are in ~/tmp/ One has relative file name ".mozilla/...". - When using a timer callback vgetc_busy is reset, allowing for using input(). But in a channel callback this does not happen. We need to do something similar to check_due_timer(). Also see #3809. @@ -662,13 +629,10 @@ Also see #2352, want better control over balloon, perhaps set the position. Should also be possible to add highlighting, like in the status line? balloonexpr() on MS-Windows GUI doesn't handle accented chars? (nivaemail, 2018 Sep 14) -Another request: #3811. More warnings from static analysis: https://lgtm.com/projects/g/vim/vim/alerts/?mode=list -Still a E315 error when using terminal. (Masato Nishihata, #3959) - Not existing directory in CDPATH leads to two shell calls. (#4525) Use dict_iterate_start() / dict_iterate_next() instead of relying on the @@ -676,16 +640,10 @@ internals of the dict structure. nvo-mode mapping works on Windows, not on Linux. (#3678) -Missing tests for: -- add_termcap_entry() - Redo only remembers the last change. Could use "{count}g." to redo an older change. How does the user know which change? At least have a way to list them: ":repeats". Add to history, like search history and command line history. -Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17) -Related to bracketed paste. I cannot reproduce it. - When 'confirm' is set a "silent q" doesn't show the prompt. It should in this case. (Nate Peterson, 2019 Jan 31, #3892) For "silent! q" it should not prompt and just fail. @@ -708,10 +666,6 @@ When 'sidescrolloff' is set, using "zl" to go to the end of the line, suddenly scrolls back. Should allow for this scrolling, like 'scrolloff' does when using CTRL-E. (Yee Cheng Chin, #3721) -Invalid memory access with old regexp engine. (Dominique Pelle, 2018 Sep 3, -#3405) Introduced by 8.0.1517, which was fixing another memory access error. -(Sep 8) - Add function to make use of internal diff, working on two lists and returning unified diff (list of lines). @@ -730,19 +684,13 @@ highlight name. Esp. for the statusline. And "extends" and "precedes" are also useful without 'list' set. Also in 'fillchars' or another option? -Sourceforge Vim pages still have content, redirect from empty page. +Sourceforge Vim pages still have content, make them empty, keep redirect. Check for PHP errors. (Wayne Davison, 2018 Oct 26) Problem with Visual yank when 'linebreak' and 'showbreak' are set. Patch with tests, but it's not clear how it is supposed to work. (tommm, 2018 Nov 17) Asked about this, Dec 22. Christian will have a look. -home_replace() uses $HOME instead of "homedir". (Cesar Martins, 2018 Aug 9) - -When the status line uses term_gettitle(), it does not get updated when the -terminal title changes. (Josh Triplett, 2018 Sep 9, #3418) -How would we know that the status line needs to be updated? - Update for xim-input-style help (Tony Mechelynck, 2019 Jan 10). Feedback from someone who uses this? @@ -759,9 +707,6 @@ Further xdiff changes: Difference between two regexp engines: #3373 -Patch to add ch_listen() (Yasuhiro Matsumoto, 2018 Nov 26, #3639) -What is the practical use for this? Need an example. - When the last line wraps, selecting with the mouse below that line only includes the first screen line. (2018 Aug 23, #3368) @@ -773,11 +718,9 @@ Merge checking for 'cursorline' and 'concealcursor', see neovim #9492. Add a windowID argument to placing a sign, so that it only shows up in one window for the buffer. -Win32 key codes are messy. Mike Williams tried to fix that, but now old -mappings no longer work. Create a new terminal for the better solution? - Compiler warning (geeknik, 2017 Oct 26): -- undefined left shift in get_string_tv() (#2250) +- undefined left shift in eval_string(), before hex2nr() (#2250) + Use unsigned for "nr". Add Native language protocol server (LSP) support. (Yegappan Lakshmanan, 2018 Oct 28) @@ -789,27 +732,14 @@ Nov 22). Patch to list user digraphs. (Christian Brabandt, 2012 Apr 14) -Patch to add digraph() function. (Christian Brabandt, 2013 Aug 22, update Aug -24) - -Try out background make plugin: - https://github.com/AndrewVos/vim-make-background -or asyncmake: - https://github.com/yegappan/asyncmake - -Cursor in wrong position when line wraps. (#2540) - Setting 'columns' in a BufEnter autocommand causes a second tab width to behave strangely, as if there is a gap and a vertical window separator. (Michael Soyka, 2018 Sep 23, #3477) -Make {skip} argument of searchpair() consistent with other places where we -pass an expression to evaluate. Allow passing zero for "never skip". - Add an option similar to 'lazyredraw' to skip redrawing while executing a script or function. -When using a menu item while the "more" prompt is displayed doesn't work well. +Using a menu item while the "more" prompt is displayed doesn't work well. E.g. after using help->version. Have a key that ends the "more" prompt and does nothing otherwise? @@ -823,26 +753,9 @@ MS-Windows. Perhaps in \# the \ is seen as a path separator. (Axel Bender, 2017 Feb 9) Can we expand wildcards first and send the path literally to the receiving Vim? Or make an exception for #, it's not useful remotely. -Should add a test for every command line argument. Check coverage for what is -missing: --nofork, -A , -b, -h, etc. - -":au * * command" should not be allowed, only use * for event when listing or -deleting autocmds, not when adding them. - Column number is wrong when using 'linebreak' and 'wrap'. (Keith Smiley, 2018 Jan 15, #2555) -":bufdo e" disabled syntax HL in windows other than the current. (BPJ) - -Check argument of systemlist(). (Pavlov) - -No maintainer for Vietnamese translations. -No maintainer for Simplified Chinese translations. - -Python indenting: alternative way to indent arguments: -http://orchistro.tistory.com/236 -Should be supported with a flag. - Add Makefiles to the runtime/spell directory tree, since nobody uses Aap. Will have to explain the manual steps (downloading the .aff and .dic files, applying the diff, etc. @@ -852,9 +765,6 @@ word is re-added to it. (Matej Cepl, 2018 Feb 6) Fold at end of the buffer behaves inconsistently. (James McCoy, 2017 Oct 9) -Using 'wildignore' also applies to literally entered file name. Also with -:drop (remote commands). - Implement option_save() and option_restore(): option_restore({list}) *option_restore()* Restore options previously saved by option_save(). @@ -1688,9 +1598,6 @@ Should be possible to enable/disable matchparen per window or buffer. Add a check for b:no_match_paren in Highlight_matching_Pair() (Marcin Szamotulski, 2012 Nov 8) -Session file creation: 'autochdir' causes trouble. Keep it off until after -loading all files. - 'iminsert' global value set when using ":setlocal iminsert"? (Wu, 2012 Jun 23) Patch to append regexp to tag commands to make it possible to select one out @@ -2105,9 +2012,6 @@ opening/closing window causes other window with 'winfixheight' to change height. Also happens when there is another window in the frame, if it's not very high. (Yegappan Lakshmanan, 2010 Jul 22, Michael Peeters, 2010 Jul 22) -Session file generates error upon loading, cause by --remote-silent-tab. -(7tommm (ytommm) 2010 Nov 24) - Using ~ works OK on 'a' with composing char, but not on 0x0418 with composing char 0x0301. (Tony Mechelynck, 2009 Mar 4) @@ -5510,6 +5414,35 @@ Modelines: Sessions: +- Session file contains absolute paths when "curdir" is removed form + 'sessionoptions', making it impossible to have a session with a relative + path. (#4450) +- Session file only contains local option values for buffers that are in a + window, not other buffers. (#7532) +- Script generated by :mksession does not work well if there are windows + with modified buffers: + change "silent only" into "silent only!" + change "edit fname" of first buffer to "hide edit fname" + skip "badd fname" if "fname" is already in the buffer list + remove remark about unloading buffers from documentation +- When session file has name in argument list but the buffer was deleted, + the buffer is not deleted when using the session file. (#1393) Should add + the buffer in hidden state. +- When a session file is created and there are "nofile" buffers, these are + not filled. Need to trigger BufReadCmd autocommands. Also handle + deleting the initial empty buffer better. (ZyX, 2015 March 8) +- Setting the spell file in a session only reads the local additions, not + the normal spell file. (Enno Nagel, 2014 Mar 29) +- Directory wrong in session file, caused by ":lcd" in BufEnter autocommand. + (Felix Kater, 2009 Mar 3) +- Something wrong with session that has "cd" commands and "badd", in such a + way that Vim doesn't find the edited file in the buffer list, causing the + ATTENTION message? (Tony Mechelynck, 2008 Dec 1) Also: swap files are in + ~/tmp/ One has relative file name ".mozilla/...". +- Session file creation: 'autochdir' causes trouble. Keep it off until + after loading all files. +- Session file generates error upon loading, cause by --remote-silent-tab. + (7tommm (ytommm) 2010 Nov 24) 8 DOS/Windows: ":mksession" generates a "cd" command where "aa\#bb" means directory "#bb" in "aa", but it's used as "aa#bb". (Ronald Hoellwarth) 7 When there is a "help.txt" window in a session file, restoring that @@ -5521,7 +5454,6 @@ Sessions: default value. 7 With ":mksession" also store the tag stack and jump history. (Michal Malecki) -7 Persistent variables: "p:var"; stored in viminfo file and sessions files. Options: diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt index cfc4afb30d..13c705acf8 100644 --- a/runtime/doc/uganda.txt +++ b/runtime/doc/uganda.txt @@ -1,4 +1,4 @@ -*uganda.txt* For Vim version 8.2. Last change: 2022 Mar 02 +*uganda.txt* For Vim version 9.0. Last change: 2022 Mar 02 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt index 3feac2a3e5..34d8054333 100644 --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -1,4 +1,4 @@ -*undo.txt* For Vim version 8.2. Last change: 2022 Jun 02 +*undo.txt* For Vim version 9.0. Last change: 2022 Jun 02 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt index 5a2f55e166..b78cb1e2f9 100644 --- a/runtime/doc/usr_01.txt +++ b/runtime/doc/usr_01.txt @@ -1,4 +1,4 @@ -*usr_01.txt* For Vim version 8.2. Last change: 2019 Nov 21 +*usr_01.txt* For Vim version 9.0. Last change: 2019 Nov 21 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt index be77da7848..b6cc5276c6 100644 --- a/runtime/doc/usr_02.txt +++ b/runtime/doc/usr_02.txt @@ -1,4 +1,4 @@ -*usr_02.txt* For Vim version 8.2. Last change: 2021 Apr 24 +*usr_02.txt* For Vim version 9.0. Last change: 2021 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt index d30bddfc62..b0a9d66c25 100644 --- a/runtime/doc/usr_03.txt +++ b/runtime/doc/usr_03.txt @@ -1,4 +1,4 @@ -*usr_03.txt* For Vim version 8.2. Last change: 2020 Sep 03 +*usr_03.txt* For Vim version 9.0. Last change: 2020 Sep 03 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt index ac629a5982..91c13aa4a3 100644 --- a/runtime/doc/usr_04.txt +++ b/runtime/doc/usr_04.txt @@ -1,4 +1,4 @@ -*usr_04.txt* For Vim version 8.2. Last change: 2021 Feb 22 +*usr_04.txt* For Vim version 9.0. Last change: 2021 Feb 22 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index 51e43df14d..06fb03bfe1 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -1,4 +1,4 @@ -*usr_05.txt* For Vim version 8.2. Last change: 2019 May 23 +*usr_05.txt* For Vim version 9.0. Last change: 2019 May 23 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt index 5e52209a96..2b6fa51336 100644 --- a/runtime/doc/usr_06.txt +++ b/runtime/doc/usr_06.txt @@ -1,4 +1,4 @@ -*usr_06.txt* For Vim version 8.2. Last change: 2021 Nov 07 +*usr_06.txt* For Vim version 9.0. Last change: 2021 Nov 07 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_07.txt b/runtime/doc/usr_07.txt index ab3677124c..2be3062ac8 100644 --- a/runtime/doc/usr_07.txt +++ b/runtime/doc/usr_07.txt @@ -1,4 +1,4 @@ -*usr_07.txt* For Vim version 8.2. Last change: 2020 Mar 23 +*usr_07.txt* For Vim version 9.0. Last change: 2020 Mar 23 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt index 3b113539c5..148f0cf86d 100644 --- a/runtime/doc/usr_08.txt +++ b/runtime/doc/usr_08.txt @@ -1,4 +1,4 @@ -*usr_08.txt* For Vim version 8.2. Last change: 2021 May 20 +*usr_08.txt* For Vim version 9.0. Last change: 2021 May 20 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt index b64af81f46..43394da6ea 100644 --- a/runtime/doc/usr_09.txt +++ b/runtime/doc/usr_09.txt @@ -1,4 +1,4 @@ -*usr_09.txt* For Vim version 8.2. Last change: 2017 Aug 11 +*usr_09.txt* For Vim version 9.0. Last change: 2017 Aug 11 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt index 7898618b4e..220a7ab0ad 100644 --- a/runtime/doc/usr_10.txt +++ b/runtime/doc/usr_10.txt @@ -1,4 +1,4 @@ -*usr_10.txt* For Vim version 8.2. Last change: 2019 Nov 22 +*usr_10.txt* For Vim version 9.0. Last change: 2019 Nov 22 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt index d26763107d..3a61082cbc 100644 --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -1,4 +1,4 @@ -*usr_11.txt* For Vim version 8.2. Last change: 2020 Oct 25 +*usr_11.txt* For Vim version 9.0. Last change: 2020 Oct 25 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt index 7781f8e388..68f6cbed61 100644 --- a/runtime/doc/usr_12.txt +++ b/runtime/doc/usr_12.txt @@ -1,4 +1,4 @@ -*usr_12.txt* For Vim version 8.2. Last change: 2021 Apr 19 +*usr_12.txt* For Vim version 9.0. Last change: 2021 Apr 19 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_20.txt b/runtime/doc/usr_20.txt index ec705955a2..479f57c76b 100644 --- a/runtime/doc/usr_20.txt +++ b/runtime/doc/usr_20.txt @@ -1,4 +1,4 @@ -*usr_20.txt* For Vim version 8.2. Last change: 2021 Nov 18 +*usr_20.txt* For Vim version 9.0. Last change: 2021 Nov 18 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt index 953a3fbc4d..2f6ee9c5de 100644 --- a/runtime/doc/usr_21.txt +++ b/runtime/doc/usr_21.txt @@ -1,4 +1,4 @@ -*usr_21.txt* For Vim version 8.2. Last change: 2019 Apr 25 +*usr_21.txt* For Vim version 9.0. Last change: 2019 Apr 25 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt index bdba90614b..d8f47bc096 100644 --- a/runtime/doc/usr_22.txt +++ b/runtime/doc/usr_22.txt @@ -1,4 +1,4 @@ -*usr_22.txt* For Vim version 8.2. Last change: 2020 Mar 28 +*usr_22.txt* For Vim version 9.0. Last change: 2020 Mar 28 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt index def737c0bf..cbcc4844c9 100644 --- a/runtime/doc/usr_23.txt +++ b/runtime/doc/usr_23.txt @@ -1,4 +1,4 @@ -*usr_23.txt* For Vim version 8.2. Last change: 2020 Dec 19 +*usr_23.txt* For Vim version 9.0. Last change: 2020 Dec 19 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_24.txt b/runtime/doc/usr_24.txt index 00a1c44175..361ce1bb83 100644 --- a/runtime/doc/usr_24.txt +++ b/runtime/doc/usr_24.txt @@ -1,4 +1,4 @@ -*usr_24.txt* For Vim version 8.2. Last change: 2018 Mar 18 +*usr_24.txt* For Vim version 9.0. Last change: 2018 Mar 18 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt index 5afe7b7b87..2f25a9fb2a 100644 --- a/runtime/doc/usr_25.txt +++ b/runtime/doc/usr_25.txt @@ -1,4 +1,4 @@ -*usr_25.txt* For Vim version 8.2. Last change: 2016 Mar 28 +*usr_25.txt* For Vim version 9.0. Last change: 2016 Mar 28 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_26.txt b/runtime/doc/usr_26.txt index e62fb929ab..7fec325cfa 100644 --- a/runtime/doc/usr_26.txt +++ b/runtime/doc/usr_26.txt @@ -1,4 +1,4 @@ -*usr_26.txt* For Vim version 8.2. Last change: 2006 Apr 24 +*usr_26.txt* For Vim version 9.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt index fa8fdb6e11..54e5c3a4bf 100644 --- a/runtime/doc/usr_27.txt +++ b/runtime/doc/usr_27.txt @@ -1,4 +1,4 @@ -*usr_27.txt* For Vim version 8.2. Last change: 2019 Jul 14 +*usr_27.txt* For Vim version 9.0. Last change: 2019 Jul 14 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt index ab123ac090..d0c351667c 100644 --- a/runtime/doc/usr_28.txt +++ b/runtime/doc/usr_28.txt @@ -1,4 +1,4 @@ -*usr_28.txt* For Vim version 8.2. Last change: 2008 Jun 14 +*usr_28.txt* For Vim version 9.0. Last change: 2008 Jun 14 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt index de1b911517..20712f27a0 100644 --- a/runtime/doc/usr_29.txt +++ b/runtime/doc/usr_29.txt @@ -1,4 +1,4 @@ -*usr_29.txt* For Vim version 8.2. Last change: 2022 Mar 13 +*usr_29.txt* For Vim version 9.0. Last change: 2022 Mar 13 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt index bcb7b59e74..a23df96606 100644 --- a/runtime/doc/usr_30.txt +++ b/runtime/doc/usr_30.txt @@ -1,4 +1,4 @@ -*usr_30.txt* For Vim version 8.2. Last change: 2007 Nov 10 +*usr_30.txt* For Vim version 9.0. Last change: 2007 Nov 10 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt index afbc91877c..455274f4fc 100644 --- a/runtime/doc/usr_31.txt +++ b/runtime/doc/usr_31.txt @@ -1,4 +1,4 @@ -*usr_31.txt* For Vim version 8.2. Last change: 2020 Jul 28 +*usr_31.txt* For Vim version 9.0. Last change: 2020 Jul 28 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_32.txt b/runtime/doc/usr_32.txt index 1cdfddde2b..9733d709cb 100644 --- a/runtime/doc/usr_32.txt +++ b/runtime/doc/usr_32.txt @@ -1,4 +1,4 @@ -*usr_32.txt* For Vim version 8.2. Last change: 2010 Jul 20 +*usr_32.txt* For Vim version 9.0. Last change: 2010 Jul 20 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt index f963e2079a..27323c6f4e 100644 --- a/runtime/doc/usr_40.txt +++ b/runtime/doc/usr_40.txt @@ -1,4 +1,4 @@ -*usr_40.txt* For Vim version 8.2. Last change: 2022 Jun 23 +*usr_40.txt* For Vim version 9.0. Last change: 2022 Jun 23 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index cd39dd3675..7f9cee487f 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -1,4 +1,4 @@ -*usr_41.txt* For Vim version 8.2. Last change: 2022 Jun 23 +*usr_41.txt* For Vim version 9.0. Last change: 2022 Jun 23 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt index 1f3e4bb858..cef7ae028a 100644 --- a/runtime/doc/usr_42.txt +++ b/runtime/doc/usr_42.txt @@ -1,4 +1,4 @@ -*usr_42.txt* For Vim version 8.2. Last change: 2008 May 05 +*usr_42.txt* For Vim version 9.0. Last change: 2008 May 05 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt index 269cd81eca..9095a8ec32 100644 --- a/runtime/doc/usr_43.txt +++ b/runtime/doc/usr_43.txt @@ -1,4 +1,4 @@ -*usr_43.txt* For Vim version 8.2. Last change: 2015 Oct 23 +*usr_43.txt* For Vim version 9.0. Last change: 2015 Oct 23 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_44.txt b/runtime/doc/usr_44.txt index 61f9b2fd88..11a0286074 100644 --- a/runtime/doc/usr_44.txt +++ b/runtime/doc/usr_44.txt @@ -1,4 +1,4 @@ -*usr_44.txt* For Vim version 8.2. Last change: 2017 May 06 +*usr_44.txt* For Vim version 9.0. Last change: 2017 May 06 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt index e93f74771f..7e919a9426 100644 --- a/runtime/doc/usr_45.txt +++ b/runtime/doc/usr_45.txt @@ -1,4 +1,4 @@ -*usr_45.txt* For Vim version 8.2. Last change: 2022 May 13 +*usr_45.txt* For Vim version 9.0. Last change: 2022 May 13 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_50.txt b/runtime/doc/usr_50.txt index e8ebeb001f..fc46388c09 100644 --- a/runtime/doc/usr_50.txt +++ b/runtime/doc/usr_50.txt @@ -1,4 +1,4 @@ -*usr_50.txt* For Vim version 8.2. Last change: 2022 Jun 20 +*usr_50.txt* For Vim version 9.0. Last change: 2022 Jun 20 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_51.txt b/runtime/doc/usr_51.txt index 800946e51e..2eea6aab84 100644 --- a/runtime/doc/usr_51.txt +++ b/runtime/doc/usr_51.txt @@ -1,4 +1,4 @@ -*usr_51.txt* For Vim version 8.2. Last change: 2022 Jun 03 +*usr_51.txt* For Vim version 9.0. Last change: 2022 Jun 03 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_52.txt b/runtime/doc/usr_52.txt index 41d0832ae2..46f01089dc 100644 --- a/runtime/doc/usr_52.txt +++ b/runtime/doc/usr_52.txt @@ -1,4 +1,4 @@ -*usr_52.txt* For Vim version 8.2. Last change: 2022 Jun 04 +*usr_52.txt* For Vim version 9.0. Last change: 2022 Jun 04 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index 574cfa971a..060e0d58da 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -1,4 +1,4 @@ -*usr_90.txt* For Vim version 8.2. Last change: 2022 May 13 +*usr_90.txt* For Vim version 9.0. Last change: 2022 May 13 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt index 59777cc98e..655d6a90db 100644 --- a/runtime/doc/usr_toc.txt +++ b/runtime/doc/usr_toc.txt @@ -1,4 +1,4 @@ -*usr_toc.txt* For Vim version 8.2. Last change: 2022 Jun 20 +*usr_toc.txt* For Vim version 9.0. Last change: 2022 Jun 20 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 42987abc56..cb5aa70475 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 8.2. Last change: 2022 Jun 25 +*various.txt* For Vim version 9.0. Last change: 2022 Jun 25 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt index c2c76b1311..052cbbd639 100644 --- a/runtime/doc/version4.txt +++ b/runtime/doc/version4.txt @@ -1,4 +1,4 @@ -*version4.txt* For Vim version 8.2. Last change: 2006 Apr 24 +*version4.txt* For Vim version 9.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version5.txt b/runtime/doc/version5.txt index 9bc43bb4dd..40f58b7779 100644 --- a/runtime/doc/version5.txt +++ b/runtime/doc/version5.txt @@ -1,4 +1,4 @@ -*version5.txt* For Vim version 8.2. Last change: 2022 Apr 06 +*version5.txt* For Vim version 9.0. Last change: 2022 Apr 06 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt index 32dacde3ec..e14e158867 100644 --- a/runtime/doc/version6.txt +++ b/runtime/doc/version6.txt @@ -1,4 +1,4 @@ -*version6.txt* For Vim version 8.2. Last change: 2022 Apr 06 +*version6.txt* For Vim version 9.0. Last change: 2022 Apr 06 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index 830dacfb4f..3b77e640c0 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 8.2. Last change: 2021 May 17 +*version7.txt* For Vim version 9.0. Last change: 2021 May 17 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt index 1cb95e0a01..3ae5ed4892 100644 --- a/runtime/doc/version8.txt +++ b/runtime/doc/version8.txt @@ -1,4 +1,4 @@ -*version8.txt* For Vim version 8.2. Last change: 2022 Feb 26 +*version8.txt* For Vim version 9.0. Last change: 2022 Feb 26 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt index 323829a59c..4e6b1cbf13 100644 --- a/runtime/doc/version9.txt +++ b/runtime/doc/version9.txt @@ -1,4 +1,4 @@ -*version9.txt* For Vim version 8.2. Last change: 2022 Jun 25 +*version9.txt* For Vim version 9.0. Last change: 2022 Jun 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -14671,7 +14671,7 @@ Files: src/vim9execute.c, src/testdir/test_vim9_script.vim Patch 8.2.2352 Problem: If the focus lost/gained escape sequence is received twice it is - not ignored. (Christ van Willigen) + not ignored. (Christ van Willegen) Solution: Adjust the logic to ignore the escape code. Files: src/term.c @@ -21611,7 +21611,7 @@ Files: runtime/doc/options.txt, src/gui.c, src/gui.h, src/gui_gtk_x11.c, Patch 8.2.3525 Problem: Option variable name does not match option name. (Christ van - Willigen) + Willegen) Solution: Rename the variable. Files: src/buffer.c, src/insexpand.c, src/option.c, src/optionstr.c, src/structs.h @@ -28625,7 +28625,7 @@ Files: src/vim9compile.c, src/proto/vim9compile.pro, src/vim9cmds.c, Patch 8.2.4667 Problem: expandcmd() fails on an error. -Solution: On failure return the command unmodified. (yegappan Lakshmanan, +Solution: On failure return the command unmodified. (Yegappan Lakshmanan, closes #10063) Files: runtime/doc/builtin.txt, src/evalfunc.c, src/testdir/test_expand.vim @@ -31311,7 +31311,7 @@ Files: src/evalbuffer.c, src/channel.c, src/cmdexpand.c, src/evalfunc.c, Patch 8.2.5108 Problem: Retab test disabled because it hangs on MS-Windows. -Solution: Also set got_int at the other place a overlong text is detected. +Solution: Also set got_int at the other place an overlong text is detected. Files: src/indent.c, src/testdir/test_retab.vim Patch 8.2.5109 @@ -31475,7 +31475,7 @@ Files: src/os_unix.c, src/regexp_nfa.c, src/regexp_bt.c Patch 8.2.5138 Problem: Various small issues. -Solution: Various small improvments. +Solution: Various small improvements. Files: src/filepath.c, src/job.c, src/mark.c, src/move.c, src/popupwin.c, src/testdir/test_filetype.vim @@ -31600,5 +31600,72 @@ Problem: Accessing invalid memory after changing terminal size. Solution: Adjust cmdline_row and msg_row to the value of Rows. Files: src/term.c +Patch 8.2.5161 +Problem: Might still access invalid memory. +Solution: Add extra check for negative value. +Files: src/message.c + +Patch 8.2.5162 +Problem: Reading before the start of the line with BS in Replace mode. +Solution: Check the cursor column is more than zero. +Files: src/edit.c + +Patch 8.2.5163 +Problem: Crash when deleting buffers in diff mode. +Solution: Recompute diffs later. Skip window without a valid buffer. +Files: src/diff.c, src/testdir/test_diffmode.vim + +Patch 8.2.5164 +Problem: Invalid memory access after diff buffer manipulations. +Solution: Use zero offset when change removes all lines in a diff block. +Files: src/diff.c, src/testdir/test_diffmode.vim + +Patch 8.2.5165 +Problem: Import test fails because 'diffexpr' isn't reset. +Solution: Reset 'diffexpr'. +Files: src/testdir/test_vim9_import.vim + +Patch 8.2.5166 +Problem: Test for DiffUpdated fails. +Solution: Also accept a count of two. +Files: src/testdir/test_diffmode.vim + +Patch 8.2.5167 +Problem: get(Fn, 'name') on funcref returns special byte code. +Solution: Use the printable name. +Files: src/evalfunc.c, src/testdir/test_getvar.vim + +Patch 8.2.5168 +Problem: Cannot build with Python 3.11. +Solution: Adjust define for _PyObject_TypeCheck. (Zdenek Dohnal, + closes #10627) +Files: src/if_python3.c + +Patch 8.2.5169 +Problem: Nested :source may use NULL pointer. +Solution: Do not use the NULL pointer. +Files: src/eval.c, src/testdir/test_vimscript.vim + +Patch 8.2.5170 +Problem: Tiny issues. +Solution: Tiny improvements. +Files: src/misc1.c, src/screen.c, src/vim.h + +Patch 8.2.5171 +Problem: Dependencies and proto files are outdated. +Solution: Update dependencies and proto files. Avoid errors. +Files: src/Makefile, src/gui_w32.c, src/os_mswin.c, src/proto/buffer.pro, + src/proto/cmdexpand.pro, src/proto/getchar.pro, + src/proto/help.pro, src/proto/mbyte.pro, src/proto/option.pro, + src/proto/screen.pro, src/proto/syntax.pro, + src/proto/textformat.pro, src/proto/textobject.pro, + src/proto/time.pro, src/proto/gui_x11.pro, src/proto/if_tcl.pro, + src/proto/os_mswin.pro + +Patch 8.2.5172 +Problem: "make menu" still uses legacy script. +Solution: make menu generation script use Vim9 script, fix errors. +Files: runtime/makemenu.vim + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index fdc8429c61..433270647f 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -1,4 +1,4 @@ -*vi_diff.txt* For Vim version 8.2. Last change: 2022 Apr 03 +*vi_diff.txt* For Vim version 9.0. Last change: 2022 Apr 03 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt index aef4230d9b..852cdb9e13 100644 --- a/runtime/doc/vim9.txt +++ b/runtime/doc/vim9.txt @@ -1,4 +1,4 @@ -*vim9.txt* For Vim version 8.2. Last change: 2022 Jun 25 +*vim9.txt* For Vim version 9.0. Last change: 2022 Jun 25 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt index 050bb22e2f..c7163c3ff0 100644 --- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -1,4 +1,4 @@ -*visual.txt* For Vim version 8.2. Last change: 2022 Jun 18 +*visual.txt* For Vim version 9.0. Last change: 2022 Jun 18 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index a5c1d140b5..595147301f 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 8.2. Last change: 2022 May 11 +*windows.txt* For Vim version 9.0. Last change: 2022 May 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/workshop.txt b/runtime/doc/workshop.txt index d9268f3512..f71866dd12 100644 --- a/runtime/doc/workshop.txt +++ b/runtime/doc/workshop.txt @@ -1,4 +1,4 @@ -*workshop.txt* For Vim version 8.2. Last change: 2019 Jan 17 +*workshop.txt* For Vim version 9.0. Last change: 2019 Jan 17 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim index 43f2eb6107..b9cd8cb7b7 100644 --- a/runtime/makemenu.vim +++ b/runtime/makemenu.vim @@ -2,7 +2,7 @@ vim9script # Script to define the syntax menu in synmenu.vim # Maintainer: Bram Moolenaar -# Last Change: 2022 Feb 04 +# Last Change: 2022 Jun 27 # This is used by "make menu" in the src directory. edit :p:h/synmenu.vim @@ -39,13 +39,13 @@ def Syn(arg: string) else # When starting a new letter, insert a menu separator. var c = submenu_name[0] - if c != s:cur_menu_char - exe 'an 50.' .. s:cur_menu_nr .. '.' .. s:cur_menu_item .. ' &Syntax.' .. menu_name .. ".-" .. c .. '- ' + if c != cur_menu_char + exe 'an 50.' .. cur_menu_nr .. '.' .. cur_menu_item .. ' &Syntax.' .. menu_name .. ".-" .. c .. '- ' cur_menu_item += 10 cur_menu_char = c endif endif - append(lnum, 'an 50.' .. s:cur_menu_nr .. '.' .. s:cur_menu_item .. ' &Syntax.' .. menu_name .. "." .. submenu_name .. ' :cal SetSyn("' .. syntax_name .. '")') + append(lnum, 'an 50.' .. cur_menu_nr .. '.' .. cur_menu_item .. ' &Syntax.' .. menu_name .. "." .. submenu_name .. ' :cal SetSyn("' .. syntax_name .. '")') cur_menu_item += 10 lnum += 1 enddef diff --git a/runtime/spell/sr/README_sr.txt b/runtime/spell/sr/README_sr.txt index 6d71973787..8f7c908ddf 100644 --- a/runtime/spell/sr/README_sr.txt +++ b/runtime/spell/sr/README_sr.txt @@ -1,7 +1,6 @@ The location of source files for Serbian spelling dictionary were downloaded -from -https://github.com/LibreOffice/dictionaries/tree/master/sr -(Serbian Spelling and Hyphenation for LibreOffice). +from https://github.com/LibreOffice/dictionaries/tree/master/sr (Serbian +Spelling and Hyphenation for LibreOffice). Here is the content of original README file from the repository: @@ -26,18 +25,21 @@ Here is the content of original README file from the repository: This dictionary used to create Vim spl file is the result of merging the two -LibreOffice dictionaries, for cyrillic and latin script. +LibreOffice dictionaries for cyrillic and latin script. -The merge was accomplished by concatenating two .dic files, removing 1061 -duplicates using the fixdup Vim script and updating the word count. +The merge was accomplished by concatenating two .dic and .aff files (appending +the latin to cyrillic). -In both affix files each SFX (and two PFX) directive had to be appended with -the . at the end of the line. KEY and WORDCHAR directives were removed, and -MIDWORD was added. Each SFX block is the union of corresponding blocks from -sr.aff and sr-Latn.aff. Header line of each block was updated to the new -count (2 times the value from the corresponding block in the input affix -file). +The first step was to fix both .aff files by adding a '.' at the end of every +SFX and PFX directive and removing directives that are not supported by Vim +(KEY, MIDWORD). + +Next, update the flags in latin .dic and .aff files so that the flag sequence +continues monotonically after the last flag number in cyrillic .aff file. + +A couple of words in cyrillic dict used a latin codepoints for 'a' and 'e', +that was also corrected. Ivan Pešić -23.06.2022. +28.06.2022. diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg index 129ce6e529..d9ebff8db8 100644 --- a/src/GvimExt/GvimExt.reg +++ b/src/GvimExt/GvimExt.reg @@ -15,6 +15,6 @@ REGEDIT4 [HKEY_LOCAL_MACHINE\Software\Vim\Gvim] "path"="gvim.exe" -[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 8.2] - "DisplayName"="Vim 8.2: Edit with Vim popup menu entry" +[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 9.0] + "DisplayName"="Vim 9.0: Edit with Vim popup menu entry" "UninstallString"="uninstall.exe" diff --git a/src/Makefile b/src/Makefile index 2c4c38275b..138c514278 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1039,8 +1039,8 @@ TOOLS = xxd/xxd$(EXEEXT) MAN1DIR = /man1 ### Vim version (adjusted by a script) -VIMMAJOR = 8 -VIMMINOR = 2 +VIMMAJOR = 9 +VIMMINOR = 0 ### Location of Vim files (should not need to be changed, and {{{1 ### some things might not work when they are changed!) @@ -1360,7 +1360,7 @@ MACVIMGUI_TESTARG = VIMPROG=../$(RELEASEDIR)/MacVim.app/Contents/MacOS/$(VIMTARG # All GUI files ALL_GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_gtk_x11.c gui_x11.c gui_haiku.cc -ALL_GUI_PRO = gui.pro gui_gtk.pro gui_motif.pro gui_xmdlg.pro gui_gtk_x11.pro gui_x11.pro gui_w32.pro gui_photon.pro gui_haiku.pro +ALL_GUI_PRO = gui.pro gui_gtk.pro gui_motif.pro gui_xmdlg.pro gui_gtk_x11.pro gui_x11.pro gui_w32.pro gui_photon.pro # }}} @@ -1657,11 +1657,11 @@ BASIC_SRC = \ usercmd.c \ userfunc.c \ version.c \ - vim9cmds.c, \ + vim9cmds.c \ vim9compile.c \ vim9execute.c \ - vim9expr.c, \ - vim9instr.c, \ + vim9expr.c \ + vim9instr.c \ vim9script.c \ vim9type.c \ viminfo.c \ @@ -3764,482 +3764,599 @@ installglinks_haiku: $(HAIKU_GLINKS) install_haiku_extra ### Dependencies: objects/alloc.o: alloc.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/arabic.o: arabic.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/arglist.o: arglist.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/autocmd.o: autocmd.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/beval.o: beval.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/blob.o: blob.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/blowfish.o: blowfish.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/buffer.o: buffer.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/change.o: change.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/charset.o: charset.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/cindent.o: cindent.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/clientserver.o: clientserver.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/clipboard.o: clipboard.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/cmdexpand.o: cmdexpand.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/cmdhist.o: cmdhist.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/crypt.o: crypt.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/crypt_zip.o: crypt_zip.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/debugger.o: debugger.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/dict.o: dict.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/diff.o: diff.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h xdiff/xdiff.h xdiff/../vim.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h xdiff/xdiff.h xdiff/../vim.h objects/digraph.o: digraph.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/drawline.o: drawline.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/drawscreen.o: drawscreen.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/edit.o: edit.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/eval.o: eval.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/evalbuffer.o: evalbuffer.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/evalfunc.o: evalfunc.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/evalvars.o: evalvars.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/evalwindow.o: evalwindow.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/ex_cmds.o: ex_cmds.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/ex_cmds2.o: ex_cmds2.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/ex_docmd.o: ex_docmd.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h ex_cmdidxs.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h ex_cmdidxs.h objects/ex_eval.o: ex_eval.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/ex_getln.o: ex_getln.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/fileio.o: fileio.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/filepath.o: filepath.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/findfile.o: findfile.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/float.o: float.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/fold.o: fold.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/getchar.o: getchar.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/gui_xim.o: gui_xim.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/hardcopy.o: hardcopy.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/hashtab.o: hashtab.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/help.o: help.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/highlight.o: highlight.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/if_cscope.o: if_cscope.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h version.h objects/indent.o: indent.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/insexpand.o: insexpand.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/json.o: json.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/list.o: list.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/locale.o: locale.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/main.o: main.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/map.o: map.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/mark.o: mark.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/match.o: match.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/mbyte.o: mbyte.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/memfile.o: memfile.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/memline.o: memline.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/menu.o: menu.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/message.o: message.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/misc1.o: misc1.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/misc2.o: misc2.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/mouse.o: mouse.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/move.o: move.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/normal.o: normal.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h nv_cmdidxs.h nv_cmds.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h nv_cmds.h nv_cmdidxs.h objects/ops.o: ops.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/option.o: option.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h optiondefs.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h optiondefs.h objects/optionstr.o: optionstr.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/os_unix.o: os_unix.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h os_unixx.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h os_unixx.h objects/pathdef.o: auto/pathdef.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/popupmenu.o: popupmenu.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/popupwin.o: popupwin.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/profiler.o: profiler.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/pty.o: pty.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/quickfix.o: quickfix.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/regexp.o: regexp.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h regexp_bt.c regexp_nfa.c + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h regexp_bt.c regexp_nfa.c objects/register.o: register.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/screen.o: screen.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/scriptfile.o: scriptfile.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/search.o: search.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/session.o: session.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/sha256.o: sha256.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/sign.o: sign.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/sound.o: sound.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/spell.o: spell.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/spellfile.o: spellfile.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/spellsuggest.o: spellsuggest.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/strings.o: strings.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/syntax.o: syntax.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/tag.o: tag.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/term.o: term.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/terminal.o: terminal.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h libvterm/include/vterm.h \ - libvterm/include/vterm_keycodes.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/testing.o: testing.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/textformat.o: textformat.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/textobject.o: textobject.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/textprop.o: textprop.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/time.o: time.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/typval.o: typval.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/ui.o: ui.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/undo.o: undo.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/usercmd.o: usercmd.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/userfunc.o: userfunc.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/version.o: version.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h -objects/vim9cmds.o: vim9cmds.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h vim9.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h +objects/vim9cmds.o: vim9cmds.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h vim9.h objects/vim9compile.o: vim9compile.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h vim9.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h vim9.h objects/vim9execute.o: vim9execute.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h vim9.h -objects/vim9expr.o: vim9expr.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h vim9.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h vim9.h +objects/vim9expr.o: vim9expr.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h vim9.h objects/vim9instr.o: vim9instr.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h vim9.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h vim9.h objects/vim9script.o: vim9script.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h vim9.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h vim9.h objects/vim9type.o: vim9type.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h vim9.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/viminfo.o: viminfo.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/window.o: window.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/bufwrite.o: bufwrite.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/gui.o: gui.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/gui_gtk.o: gui_gtk.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h gui_gtk_f.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h gui_gtk_f.h objects/gui_gtk_f.o: gui_gtk_f.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h gui_gtk_f.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h gui_gtk_f.h objects/gui_motif.o: gui_motif.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h gui_xmebw.h ../pixmaps/alert.xpm \ - ../pixmaps/error.xpm ../pixmaps/generic.xpm ../pixmaps/info.xpm \ - ../pixmaps/quest.xpm gui_x11_pm.h ../pixmaps/tb_new.xpm \ - ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm \ - ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm \ - ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h gui_xmebw.h \ + ../pixmaps/alert.xpm ../pixmaps/error.xpm ../pixmaps/generic.xpm \ + ../pixmaps/info.xpm ../pixmaps/quest.xpm gui_x11_pm.h \ + ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm \ + ../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm \ + ../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \ ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \ ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \ @@ -4253,91 +4370,113 @@ objects/gui_motif.o: gui_motif.c vim.h protodef.h auto/config.h feature.h \ ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \ ../pixmaps/tb_minwidth.xpm objects/gui_xmdlg.o: gui_xmdlg.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/gui_xmebw.o: gui_xmebw.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h gui_xmebwp.h gui_xmebw.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h gui_xmebwp.h gui_xmebw.h objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h auto/gui_gtk_gresources.h gui_gtk_f.h \ - ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h auto/gui_gtk_gresources.h \ + gui_gtk_f.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \ + ../runtime/vim48x48.xpm objects/gui_x11.o: gui_x11.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h ../runtime/vim32x32.xpm \ - ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \ + ../runtime/vim48x48.xpm objects/gui_haiku.o: gui_haiku.cc vim.h protodef.h auto/config.h feature.h \ os_unix.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/json_test.o: json_test.c main.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h json.c + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h json.c objects/kword_test.o: kword_test.c main.c vim.h protodef.h auto/config.h \ feature.h os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h \ - option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h \ + option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ ex_cmds.h spell.h proto.h globals.h errors.h charset.c objects/memfile_test.o: memfile_test.c main.c vim.h protodef.h auto/config.h \ feature.h os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h \ - option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h \ + option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ ex_cmds.h spell.h proto.h globals.h errors.h memfile.c objects/message_test.o: message_test.c main.c vim.h protodef.h auto/config.h \ feature.h os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h \ - option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h \ + option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ ex_cmds.h spell.h proto.h globals.h errors.h message.c objects/if_lua.o: if_lua.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/if_mzsch.o: if_mzsch.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h if_mzsch.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h if_mzsch.h objects/if_perl.o: auto/if_perl.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/if_perlsfio.o: if_perlsfio.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/if_python.o: if_python.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h if_py_both.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h if_py_both.h objects/if_python3.o: if_python3.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h if_py_both.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h if_py_both.h objects/if_tcl.o: if_tcl.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/if_ruby.o: if_ruby.c protodef.h auto/config.h vim.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/gui_beval.o: gui_beval.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \ + beval.h proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h errors.h objects/netbeans.o: netbeans.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h version.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h version.h objects/job.o: job.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/channel.o: channel.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h + proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \ + globals.h errors.h objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c objects/vterm_encoding.o: libvterm/src/encoding.c libvterm/src/vterm_internal.h \ libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ @@ -4366,54 +4505,66 @@ objects/vterm_vterm.o: libvterm/src/vterm.c libvterm/src/vterm_internal.h \ objects/xdiffi.o: xdiff/xdiffi.c xdiff/xinclude.h auto/config.h \ xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h termdefs.h \ - macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h \ + auto/osdef.h ascii.h keymap.h \ + termdefs.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ errors.h xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h \ xdiff/xdiffi.h xdiff/xemit.h objects/xemit.o: xdiff/xemit.c xdiff/xinclude.h auto/config.h \ xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h termdefs.h \ - macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h \ + auto/osdef.h ascii.h keymap.h \ + termdefs.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ errors.h xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h \ xdiff/xdiffi.h xdiff/xemit.h objects/xprepare.o: xdiff/xprepare.c xdiff/xinclude.h auto/config.h \ xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h termdefs.h \ - macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h \ + auto/osdef.h ascii.h keymap.h \ + termdefs.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ errors.h xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h \ xdiff/xdiffi.h xdiff/xemit.h objects/xutils.o: xdiff/xutils.c xdiff/xinclude.h auto/config.h \ xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h termdefs.h \ - macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h \ + auto/osdef.h ascii.h keymap.h \ + termdefs.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ errors.h xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h \ xdiff/xdiffi.h xdiff/xemit.h objects/xhistogram.o: xdiff/xhistogram.c xdiff/xinclude.h auto/config.h \ xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h termdefs.h \ - macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h \ + auto/osdef.h ascii.h keymap.h \ + termdefs.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ errors.h xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h \ xdiff/xdiffi.h xdiff/xemit.h objects/xpatience.o: xdiff/xpatience.c xdiff/xinclude.h auto/config.h \ xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h termdefs.h \ - macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h \ + auto/osdef.h ascii.h keymap.h \ + termdefs.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h \ + libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ errors.h xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h \ xdiff/xdiffi.h xdiff/xemit.h diff --git a/src/README.md b/src/README.md index cefbecaef0..30d57310f9 100644 --- a/src/README.md +++ b/src/README.md @@ -232,4 +232,4 @@ If you would like to help making Vim better, see the file. -This is `README.md` for version 8.2 of the Vim source code. +This is `README.md` for version 9.0 of the Vim source code. diff --git a/src/eval.c b/src/eval.c index dce78f7f04..42b883e9b0 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2387,27 +2387,32 @@ eval0_retarg( p = skipwhite(arg); ret = eval1(&p, rettv, evalarg); - expr_end = p; - p = skipwhite(p); - // In Vim9 script a command block is not split at NL characters for - // commands using an expression argument. Skip over a '#' comment to check - // for a following NL. Require white space before the '#'. - if (in_vim9script() && p > expr_end && retarg == NULL) - while (*p == '#') - { - char_u *nl = vim_strchr(p, NL); + if (ret != FAIL) + { + expr_end = p; + p = skipwhite(p); - if (nl == NULL) - break; - p = skipwhite(nl + 1); - if (eap != NULL && *p != NUL) - eap->nextcmd = p; - check_for_end = FALSE; - } + // In Vim9 script a command block is not split at NL characters for + // commands using an expression argument. Skip over a '#' comment to + // check for a following NL. Require white space before the '#'. + if (in_vim9script() && p > expr_end && retarg == NULL) + while (*p == '#') + { + char_u *nl = vim_strchr(p, NL); + + if (nl == NULL) + break; + p = skipwhite(nl + 1); + if (eap != NULL && *p != NUL) + eap->nextcmd = p; + check_for_end = FALSE; + } + + if (check_for_end) + end_error = !ends_excmd2(arg, p); + } - if (ret != FAIL && check_for_end) - end_error = !ends_excmd2(arg, p); if (ret == FAIL || end_error) { if (ret != FAIL) @@ -2433,7 +2438,8 @@ eval0_retarg( // Some of the expression may not have been consumed. Do not check for // a next command to avoid more errors, unless "|" is following, which // could only be a command separator. - if (eap != NULL && skipwhite(p)[0] == '|' && skipwhite(p)[1] != '|') + if (eap != NULL && p != NULL + && skipwhite(p)[0] == '|' && skipwhite(p)[1] != '|') eap->nextcmd = check_nextcmd(p); return FAIL; } diff --git a/src/evalfunc.c b/src/evalfunc.c index 618d6e5e79..0bc38899f6 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -4719,19 +4719,23 @@ f_get(typval_T *argvars, typval_T *rettv) if (pt != NULL) { char_u *what = tv_get_string(&argvars[1]); - char_u *n; if (STRCMP(what, "func") == 0 || STRCMP(what, "name") == 0) { + char_u *name = partial_name(pt); + rettv->v_type = (*what == 'f' ? VAR_FUNC : VAR_STRING); - n = partial_name(pt); - if (n == NULL) + if (name == NULL) rettv->vval.v_string = NULL; else { - rettv->vval.v_string = vim_strsave(n); if (rettv->v_type == VAR_FUNC) - func_ref(rettv->vval.v_string); + func_ref(name); + if (*what == 'n' && pt->pt_name == NULL + && pt->pt_func != NULL) + // use instead of the byte code + name = printable_func_name(pt->pt_func); + rettv->vval.v_string = vim_strsave(name); } } else if (STRCMP(what, "dict") == 0) diff --git a/src/gui_w32.c b/src/gui_w32.c index 7bdbf418da..f53318d677 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -272,9 +272,11 @@ typedef int HRESULT; # undef MSG typedef int MSG; typedef int NEWTEXTMETRIC; +typedef int NMHDR; typedef int OSVERSIONINFO; typedef int PWORD; typedef int RECT; +typedef int SIZE; typedef int UINT; typedef int WORD; typedef int WPARAM; diff --git a/src/if_python3.c b/src/if_python3.c index 0b05857d5a..1de8fe8d20 100644 --- a/src/if_python3.c +++ b/src/if_python3.c @@ -692,7 +692,12 @@ py3__PyObject_TypeCheck(PyObject *ob, PyTypeObject *type) { return Py_IS_TYPE(ob, type) || PyType_IsSubtype(Py_TYPE(ob), type); } -# define _PyObject_TypeCheck(o,t) py3__PyObject_TypeCheck(o,t) +# if PY_VERSION_HEX >= 0x030b00b3 +# undef PyObject_TypeCheck +# define PyObject_TypeCheck(o,t) py3__PyObject_TypeCheck(o,t) +# else +# define _PyObject_TypeCheck(o,t) py3__PyObject_TypeCheck(o,t) +# endif # endif # ifdef MSWIN diff --git a/src/misc1.c b/src/misc1.c index 6de170e9d6..c368ad7099 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -2411,7 +2411,8 @@ get_cmd_output_as_rettv( if (in_vim9script() && (check_for_string_arg(argvars, 0) == FAIL - || check_for_opt_string_or_number_or_list_arg(argvars, 1) == FAIL)) + || check_for_opt_string_or_number_or_list_arg(argvars, 1) + == FAIL)) return; if (argvars[1].v_type != VAR_UNKNOWN) diff --git a/src/os_mswin.c b/src/os_mswin.c index 256da04580..f06583cc90 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -92,6 +92,7 @@ typedef int HFONT; typedef int HICON; typedef int HWND; typedef int INPUT_RECORD; +typedef int INT_PTR; typedef int KEY_EVENT_RECORD; typedef int LOGFONTW; typedef int LPARAM; diff --git a/src/proto/buffer.pro b/src/proto/buffer.pro index 564b655402..094feed9ca 100644 --- a/src/proto/buffer.pro +++ b/src/proto/buffer.pro @@ -11,8 +11,8 @@ void buf_freeall(buf_T *buf, int flags); void free_wininfo(wininfo_T *wip); void goto_buffer(exarg_T *eap, int start, int dir, int count); void handle_swap_exists(bufref_T *old_curbuf); -char *do_bufdel(int command, char_u *arg, int addr_count, int start_bnr, int end_bnr, int forceit); int do_buffer(int action, int start, int dir, int count, int forceit); +char *do_bufdel(int command, char_u *arg, int addr_count, int start_bnr, int end_bnr, int forceit); void set_curbuf(buf_T *buf, int action); void do_autochdir(void); void no_write_message(void); diff --git a/src/proto/cmdexpand.pro b/src/proto/cmdexpand.pro index 924b0b4529..e42ed6d423 100644 --- a/src/proto/cmdexpand.pro +++ b/src/proto/cmdexpand.pro @@ -1,19 +1,19 @@ /* cmdexpand.c */ int cmdline_fuzzy_complete(char_u *fuzzystr); int nextwild(expand_T *xp, int type, int options, int escape); -char_u *ExpandOne(expand_T *xp, char_u *str, char_u *orig, int options, int mode); -void ExpandInit(expand_T *xp); -void ExpandCleanup(expand_T *xp); void cmdline_pum_display(void); int cmdline_pum_active(void); void cmdline_pum_remove(void); void cmdline_pum_cleanup(cmdline_info_T *cclp); int cmdline_compl_startcol(void); +char_u *ExpandOne(expand_T *xp, char_u *str, char_u *orig, int options, int mode); +void ExpandInit(expand_T *xp); +void ExpandCleanup(expand_T *xp); int showmatches(expand_T *xp, int wildmenu); char_u *sm_gettail(char_u *s); char_u *addstar(char_u *fname, int len, int context); -void set_cmd_context(expand_T *xp, char_u *str, int len, int col, int use_ccline); void set_expand_context(expand_T *xp); +void set_cmd_context(expand_T *xp, char_u *str, int len, int col, int use_ccline); int expand_cmdline(expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches); void globpath(char_u *path, char_u *file, garray_T *ga, int expand_options); int wildmenu_translate_key(cmdline_info_T *cclp, int key, expand_T *xp, int did_wild_list); diff --git a/src/proto/getchar.pro b/src/proto/getchar.pro index a0342577d7..47af0bb32b 100644 --- a/src/proto/getchar.pro +++ b/src/proto/getchar.pro @@ -24,7 +24,7 @@ int start_redo_ins(void); void stop_redo_ins(void); int noremap_keys(void); int ins_typebuf(char_u *str, int noremap, int offset, int nottyped, int silent); -int ins_char_typebuf(int c, int modifier); +int ins_char_typebuf(int c, int modifiers); int typebuf_changed(int tb_change_cnt); int typebuf_typed(void); int typebuf_maplen(void); diff --git a/src/proto/gui_x11.pro b/src/proto/gui_x11.pro index 5dde37d462..6e8974e0c8 100644 --- a/src/proto/gui_x11.pro +++ b/src/proto/gui_x11.pro @@ -23,7 +23,6 @@ void gui_mch_free_font(GuiFont font); void gui_mch_free_fontset(GuiFontset fontset); GuiFontset gui_mch_get_fontset(char_u *name, int giveErrorIfMissing, int fixed_width); int fontset_height(XFontSet fs); -int fontset_height2(XFontSet fs); guicolor_T gui_mch_get_color(char_u *name); guicolor_T gui_mch_get_rgb_color(int r, int g, int b); void gui_mch_set_fg_color(guicolor_T color); diff --git a/src/proto/help.pro b/src/proto/help.pro index 96f4efeb02..d5fa8d6acb 100644 --- a/src/proto/help.pro +++ b/src/proto/help.pro @@ -11,4 +11,3 @@ void ex_exusage(exarg_T *eap); void ex_viusage(exarg_T *eap); void ex_helptags(exarg_T *eap); /* vim: set ft=c : */ - diff --git a/src/proto/if_tcl.pro b/src/proto/if_tcl.pro index 11ca7a20ea..b5f1cc2b71 100644 --- a/src/proto/if_tcl.pro +++ b/src/proto/if_tcl.pro @@ -1,7 +1,7 @@ /* if_tcl.c */ void vim_tcl_init(char *arg); -void vim_tcl_finalize(void); int tcl_enabled(int verbose); +void vim_tcl_finalize(void); void tcl_end(void); void ex_tcl(exarg_T *eap); void ex_tclfile(exarg_T *eap); diff --git a/src/proto/mbyte.pro b/src/proto/mbyte.pro index 1cd02a9038..c429adcf8a 100644 --- a/src/proto/mbyte.pro +++ b/src/proto/mbyte.pro @@ -78,6 +78,7 @@ void *my_iconv_open(char_u *to, char_u *from); int iconv_enabled(int verbose); void iconv_end(void); void f_getimstatus(typval_T *argvars, typval_T *rettv); +void f_iconv(typval_T *argvars, typval_T *rettv); int convert_setup(vimconv_T *vcp, char_u *from, char_u *to); int convert_setup_ext(vimconv_T *vcp, char_u *from, int from_unicode_is_utf8, char_u *to, int to_unicode_is_utf8); int convert_input(char_u *ptr, int len, int maxlen); @@ -86,5 +87,4 @@ char_u *string_convert(vimconv_T *vcp, char_u *ptr, int *lenp); char_u *string_convert_ext(vimconv_T *vcp, char_u *ptr, int *lenp, int *unconvlenp); void f_setcellwidths(typval_T *argvars, typval_T *rettv); void f_charclass(typval_T *argvars, typval_T *rettv); -void f_iconv(typval_T *argvars UNUSED, typval_T *rettv); /* vim: set ft=c : */ diff --git a/src/proto/option.pro b/src/proto/option.pro index cef998b795..c64672d823 100644 --- a/src/proto/option.pro +++ b/src/proto/option.pro @@ -64,7 +64,7 @@ void reset_modifiable(void); void set_iminsert_global(void); void set_imsearch_global(void); void set_context_in_set_cmd(expand_T *xp, char_u *arg, int opt_flags); -int ExpandSettings(expand_T *xp, regmatch_T *regmatch, char_u *fuzzystr, int *numMatches, char_u ***matches, int do_fuzzy); +int ExpandSettings(expand_T *xp, regmatch_T *regmatch, char_u *fuzzystr, int *numMatches, char_u ***matches, int can_fuzzy); int ExpandOldSetting(int *num_file, char_u ***file); int shortmess(int x); void vimrc_found(char_u *fname, char_u *envname); diff --git a/src/proto/os_mswin.pro b/src/proto/os_mswin.pro index e3c5b60974..c63129f145 100644 --- a/src/proto/os_mswin.pro +++ b/src/proto/os_mswin.pro @@ -9,6 +9,7 @@ int mch_can_restore_icon(void); int mch_FullName(char_u *fname, char_u *buf, int len, int force); int mch_isFullName(char_u *fname); void slash_adjust(char_u *p); +char_u *resolve_appexeclink(char_u *fname); int vim_stat(const char *name, stat_T *stp); void mch_settmode(tmode_T tmode); int mch_get_shellsize(void); @@ -50,5 +51,4 @@ char *charset_id2name(int id); char *quality_id2name(DWORD id); int get_logfont(LOGFONTW *lf, char_u *name, HDC printer_dc, int verbose); void channel_init_winsock(void); -char_u *resolve_appexeclink(char_u *fname); /* vim: set ft=c : */ diff --git a/src/proto/screen.pro b/src/proto/screen.pro index 6d1993d2b5..0ee1b5efb0 100644 --- a/src/proto/screen.pro +++ b/src/proto/screen.pro @@ -17,7 +17,7 @@ void win_redr_custom(win_T *wp, int draw_ruler); void screen_putchar(int c, int row, int col, int attr); void screen_getbytes(int row, int col, char_u *bytes, int *attrp); void screen_puts(char_u *text, int row, int col, int attr); -void screen_puts_len(char_u *text, int textlen, int row, int col, int attr); +void screen_puts_len(char_u *text, int textlen, int row, int col, int attr_arg); void start_search_hl(void); void end_search_hl(void); void screen_stop_highlight(void); diff --git a/src/proto/syntax.pro b/src/proto/syntax.pro index f2196fa172..c06498c875 100644 --- a/src/proto/syntax.pro +++ b/src/proto/syntax.pro @@ -1,5 +1,4 @@ /* syntax.c */ -void syn_set_timeout(proftime_T *tm); void syntax_start(win_T *wp, linenr_T lnum); void syn_stack_free_all(synblock_T *block); void syn_stack_apply_changes(buf_T *buf); diff --git a/src/proto/textformat.pro b/src/proto/textformat.pro index 7ed9428c9a..6f358fadf5 100644 --- a/src/proto/textformat.pro +++ b/src/proto/textformat.pro @@ -2,7 +2,7 @@ int has_format_option(int x); void internal_format(int textwidth, int second_indent, int flags, int format_only, int c); void auto_format(int trailblank, int prev_line); -void check_auto_format(int); +void check_auto_format(int end_insert); int comp_textwidth(int ff); void op_format(oparg_T *oap, int keep_cursor); void op_formatexpr(oparg_T *oap); diff --git a/src/proto/textobject.pro b/src/proto/textobject.pro index 7931979140..59116353da 100644 --- a/src/proto/textobject.pro +++ b/src/proto/textobject.pro @@ -13,4 +13,3 @@ int current_tagblock(oparg_T *oap, long count_arg, int include); int current_par(oparg_T *oap, long count, int include, int type); int current_quote(oparg_T *oap, long count, int include, int quotechar); /* vim: set ft=c : */ - diff --git a/src/proto/time.pro b/src/proto/time.pro index becafea3b2..54ed4ba7bf 100644 --- a/src/proto/time.pro +++ b/src/proto/time.pro @@ -1,6 +1,6 @@ /* time.c */ -char *get_ctime(time_t thetime, int add_newline); time_T vim_time(void); +char *get_ctime(time_t thetime, int add_newline); void f_localtime(typval_T *argvars, typval_T *rettv); void f_reltime(typval_T *argvars, typval_T *rettv); void f_reltimefloat(typval_T *argvars, typval_T *rettv); diff --git a/src/screen.c b/src/screen.c index ac0abae76f..6d3f17f5f8 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4174,7 +4174,7 @@ screen_del_lines( skip_showmode() { // Call char_avail() only when we are going to show something, because it - // takes a bit of time. redrawing() may also call char_avail_avail(). + // takes a bit of time. redrawing() may also call char_avail(). if (global_busy || msg_silent != 0 || !redrawing() diff --git a/src/testdir/test_getvar.vim b/src/testdir/test_getvar.vim index c82fdd5cc6..2065186a5a 100644 --- a/src/testdir/test_getvar.vim +++ b/src/testdir/test_getvar.vim @@ -134,11 +134,20 @@ func Test_get_lambda() call assert_equal([], get(l:L, 'args')) endfunc +func s:FooBar() +endfunc + " get({func}, {what} [, {default}]) func Test_get_func() let l:F = function('tr') call assert_equal('tr', get(l:F, 'name')) call assert_equal(l:F, get(l:F, 'func')) + + let Fb_func = function('s:FooBar') + call assert_match('\d\+_FooBar', get(Fb_func, 'name')) + let Fb_ref = funcref('s:FooBar') + call assert_match('\d\+_FooBar', get(Fb_ref, 'name')) + call assert_equal({'func has': 'no dict'}, get(l:F, 'dict', {'func has': 'no dict'})) call assert_equal(0, get(l:F, 'dict')) call assert_equal([], get(l:F, 'args')) diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim index c9f58c2397..07dc59d15a 100644 --- a/src/testdir/test_vimscript.vim +++ b/src/testdir/test_vimscript.vim @@ -7528,6 +7528,25 @@ func Test_for_over_string() call assert_equal('', res) endfunc +" Test for deeply nested :source command {{{1 +func Test_deeply_nested_source() + let lines =<< trim END + + so + sil 0scr + delete + so + 0 + END + call writefile(["vim9 silent! @0 \n/"] + lines, 'Xnested.vim') + + " this must not crash + let cmd = GetVimCommand() .. " -e -s -S Xnested.vim -c qa!" + call system(cmd) + + call delete('Xnested.vim') +endfunc + "------------------------------------------------------------------------------- " Modelines {{{1 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c index 524bdf934c..dd661d82ae 100644 --- a/src/version.c +++ b/src/version.c @@ -750,10336 +750,6 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ -/**/ - 5166, -/**/ - 5165, -/**/ - 5164, -/**/ - 5163, -/**/ - 5162, -/**/ - 5161, -/**/ - 5160, -/**/ - 5159, -/**/ - 5158, -/**/ - 5157, -/**/ - 5156, -/**/ - 5155, -/**/ - 5154, -/**/ - 5153, -/**/ - 5152, -/**/ - 5151, -/**/ - 5150, -/**/ - 5149, -/**/ - 5148, -/**/ - 5147, -/**/ - 5146, -/**/ - 5145, -/**/ - 5144, -/**/ - 5143, -/**/ - 5142, -/**/ - 5141, -/**/ - 5140, -/**/ - 5139, -/**/ - 5138, -/**/ - 5137, -/**/ - 5136, -/**/ - 5135, -/**/ - 5134, -/**/ - 5133, -/**/ - 5132, -/**/ - 5131, -/**/ - 5130, -/**/ - 5129, -/**/ - 5128, -/**/ - 5127, -/**/ - 5126, -/**/ - 5125, -/**/ - 5124, -/**/ - 5123, -/**/ - 5122, -/**/ - 5121, -/**/ - 5120, -/**/ - 5119, -/**/ - 5118, -/**/ - 5117, -/**/ - 5116, -/**/ - 5115, -/**/ - 5114, -/**/ - 5113, -/**/ - 5112, -/**/ - 5111, -/**/ - 5110, -/**/ - 5109, -/**/ - 5108, -/**/ - 5107, -/**/ - 5106, -/**/ - 5105, -/**/ - 5104, -/**/ - 5103, -/**/ - 5102, -/**/ - 5101, -/**/ - 5100, -/**/ - 5099, -/**/ - 5098, -/**/ - 5097, -/**/ - 5096, -/**/ - 5095, -/**/ - 5094, -/**/ - 5093, -/**/ - 5092, -/**/ - 5091, -/**/ - 5090, -/**/ - 5089, -/**/ - 5088, -/**/ - 5087, -/**/ - 5086, -/**/ - 5085, -/**/ - 5084, -/**/ - 5083, -/**/ - 5082, -/**/ - 5081, -/**/ - 5080, -/**/ - 5079, -/**/ - 5078, -/**/ - 5077, -/**/ - 5076, -/**/ - 5075, -/**/ - 5074, -/**/ - 5073, -/**/ - 5072, -/**/ - 5071, -/**/ - 5070, -/**/ - 5069, -/**/ - 5068, -/**/ - 5067, -/**/ - 5066, -/**/ - 5065, -/**/ - 5064, -/**/ - 5063, -/**/ - 5062, -/**/ - 5061, -/**/ - 5060, -/**/ - 5059, -/**/ - 5058, -/**/ - 5057, -/**/ - 5056, -/**/ - 5055, -/**/ - 5054, -/**/ - 5053, -/**/ - 5052, -/**/ - 5051, -/**/ - 5050, -/**/ - 5049, -/**/ - 5048, -/**/ - 5047, -/**/ - 5046, -/**/ - 5045, -/**/ - 5044, -/**/ - 5043, -/**/ - 5042, -/**/ - 5041, -/**/ - 5040, -/**/ - 5039, -/**/ - 5038, -/**/ - 5037, -/**/ - 5036, -/**/ - 5035, -/**/ - 5034, -/**/ - 5033, -/**/ - 5032, -/**/ - 5031, -/**/ - 5030, -/**/ - 5029, -/**/ - 5028, -/**/ - 5027, -/**/ - 5026, -/**/ - 5025, -/**/ - 5024, -/**/ - 5023, -/**/ - 5022, -/**/ - 5021, -/**/ - 5020, -/**/ - 5019, -/**/ - 5018, -/**/ - 5017, -/**/ - 5016, -/**/ - 5015, -/**/ - 5014, -/**/ - 5013, -/**/ - 5012, -/**/ - 5011, -/**/ - 5010, -/**/ - 5009, -/**/ - 5008, -/**/ - 5007, -/**/ - 5006, -/**/ - 5005, -/**/ - 5004, -/**/ - 5003, -/**/ - 5002, -/**/ - 5001, -/**/ - 5000, -/**/ - 4999, -/**/ - 4998, -/**/ - 4997, -/**/ - 4996, -/**/ - 4995, -/**/ - 4994, -/**/ - 4993, -/**/ - 4992, -/**/ - 4991, -/**/ - 4990, -/**/ - 4989, -/**/ - 4988, -/**/ - 4987, -/**/ - 4986, -/**/ - 4985, -/**/ - 4984, -/**/ - 4983, -/**/ - 4982, -/**/ - 4981, -/**/ - 4980, -/**/ - 4979, -/**/ - 4978, -/**/ - 4977, -/**/ - 4976, -/**/ - 4975, -/**/ - 4974, -/**/ - 4973, -/**/ - 4972, -/**/ - 4971, -/**/ - 4970, -/**/ - 4969, -/**/ - 4968, -/**/ - 4967, -/**/ - 4966, -/**/ - 4965, -/**/ - 4964, -/**/ - 4963, -/**/ - 4962, -/**/ - 4961, -/**/ - 4960, -/**/ - 4959, -/**/ - 4958, -/**/ - 4957, -/**/ - 4956, -/**/ - 4955, -/**/ - 4954, -/**/ - 4953, -/**/ - 4952, -/**/ - 4951, -/**/ - 4950, -/**/ - 4949, -/**/ - 4948, -/**/ - 4947, -/**/ - 4946, -/**/ - 4945, -/**/ - 4944, -/**/ - 4943, -/**/ - 4942, -/**/ - 4941, -/**/ - 4940, -/**/ - 4939, -/**/ - 4938, -/**/ - 4937, -/**/ - 4936, -/**/ - 4935, -/**/ - 4934, -/**/ - 4933, -/**/ - 4932, -/**/ - 4931, -/**/ - 4930, -/**/ - 4929, -/**/ - 4928, -/**/ - 4927, -/**/ - 4926, -/**/ - 4925, -/**/ - 4924, -/**/ - 4923, -/**/ - 4922, -/**/ - 4921, -/**/ - 4920, -/**/ - 4919, -/**/ - 4918, -/**/ - 4917, -/**/ - 4916, -/**/ - 4915, -/**/ - 4914, -/**/ - 4913, -/**/ - 4912, -/**/ - 4911, -/**/ - 4910, -/**/ - 4909, -/**/ - 4908, -/**/ - 4907, -/**/ - 4906, -/**/ - 4905, -/**/ - 4904, -/**/ - 4903, -/**/ - 4902, -/**/ - 4901, -/**/ - 4900, -/**/ - 4899, -/**/ - 4898, -/**/ - 4897, -/**/ - 4896, -/**/ - 4895, -/**/ - 4894, -/**/ - 4893, -/**/ - 4892, -/**/ - 4891, -/**/ - 4890, -/**/ - 4889, -/**/ - 4888, -/**/ - 4887, -/**/ - 4886, -/**/ - 4885, -/**/ - 4884, -/**/ - 4883, -/**/ - 4882, -/**/ - 4881, -/**/ - 4880, -/**/ - 4879, -/**/ - 4878, -/**/ - 4877, -/**/ - 4876, -/**/ - 4875, -/**/ - 4874, -/**/ - 4873, -/**/ - 4872, -/**/ - 4871, -/**/ - 4870, -/**/ - 4869, -/**/ - 4868, -/**/ - 4867, -/**/ - 4866, -/**/ - 4865, -/**/ - 4864, -/**/ - 4863, -/**/ - 4862, -/**/ - 4861, -/**/ - 4860, -/**/ - 4859, -/**/ - 4858, -/**/ - 4857, -/**/ - 4856, -/**/ - 4855, -/**/ - 4854, -/**/ - 4853, -/**/ - 4852, -/**/ - 4851, -/**/ - 4850, -/**/ - 4849, -/**/ - 4848, -/**/ - 4847, -/**/ - 4846, -/**/ - 4845, -/**/ - 4844, -/**/ - 4843, -/**/ - 4842, -/**/ - 4841, -/**/ - 4840, -/**/ - 4839, -/**/ - 4838, -/**/ - 4837, -/**/ - 4836, -/**/ - 4835, -/**/ - 4834, -/**/ - 4833, -/**/ - 4832, -/**/ - 4831, -/**/ - 4830, -/**/ - 4829, -/**/ - 4828, -/**/ - 4827, -/**/ - 4826, -/**/ - 4825, -/**/ - 4824, -/**/ - 4823, -/**/ - 4822, -/**/ - 4821, -/**/ - 4820, -/**/ - 4819, -/**/ - 4818, -/**/ - 4817, -/**/ - 4816, -/**/ - 4815, -/**/ - 4814, -/**/ - 4813, -/**/ - 4812, -/**/ - 4811, -/**/ - 4810, -/**/ - 4809, -/**/ - 4808, -/**/ - 4807, -/**/ - 4806, -/**/ - 4805, -/**/ - 4804, -/**/ - 4803, -/**/ - 4802, -/**/ - 4801, -/**/ - 4800, -/**/ - 4799, -/**/ - 4798, -/**/ - 4797, -/**/ - 4796, -/**/ - 4795, -/**/ - 4794, -/**/ - 4793, -/**/ - 4792, -/**/ - 4791, -/**/ - 4790, -/**/ - 4789, -/**/ - 4788, -/**/ - 4787, -/**/ - 4786, -/**/ - 4785, -/**/ - 4784, -/**/ - 4783, -/**/ - 4782, -/**/ - 4781, -/**/ - 4780, -/**/ - 4779, -/**/ - 4778, -/**/ - 4777, -/**/ - 4776, -/**/ - 4775, -/**/ - 4774, -/**/ - 4773, -/**/ - 4772, -/**/ - 4771, -/**/ - 4770, -/**/ - 4769, -/**/ - 4768, -/**/ - 4767, -/**/ - 4766, -/**/ - 4765, -/**/ - 4764, -/**/ - 4763, -/**/ - 4762, -/**/ - 4761, -/**/ - 4760, -/**/ - 4759, -/**/ - 4758, -/**/ - 4757, -/**/ - 4756, -/**/ - 4755, -/**/ - 4754, -/**/ - 4753, -/**/ - 4752, -/**/ - 4751, -/**/ - 4750, -/**/ - 4749, -/**/ - 4748, -/**/ - 4747, -/**/ - 4746, -/**/ - 4745, -/**/ - 4744, -/**/ - 4743, -/**/ - 4742, -/**/ - 4741, -/**/ - 4740, -/**/ - 4739, -/**/ - 4738, -/**/ - 4737, -/**/ - 4736, -/**/ - 4735, -/**/ - 4734, -/**/ - 4733, -/**/ - 4732, -/**/ - 4731, -/**/ - 4730, -/**/ - 4729, -/**/ - 4728, -/**/ - 4727, -/**/ - 4726, -/**/ - 4725, -/**/ - 4724, -/**/ - 4723, -/**/ - 4722, -/**/ - 4721, -/**/ - 4720, -/**/ - 4719, -/**/ - 4718, -/**/ - 4717, -/**/ - 4716, -/**/ - 4715, -/**/ - 4714, -/**/ - 4713, -/**/ - 4712, -/**/ - 4711, -/**/ - 4710, -/**/ - 4709, -/**/ - 4708, -/**/ - 4707, -/**/ - 4706, -/**/ - 4705, -/**/ - 4704, -/**/ - 4703, -/**/ - 4702, -/**/ - 4701, -/**/ - 4700, -/**/ - 4699, -/**/ - 4698, -/**/ - 4697, -/**/ - 4696, -/**/ - 4695, -/**/ - 4694, -/**/ - 4693, -/**/ - 4692, -/**/ - 4691, -/**/ - 4690, -/**/ - 4689, -/**/ - 4688, -/**/ - 4687, -/**/ - 4686, -/**/ - 4685, -/**/ - 4684, -/**/ - 4683, -/**/ - 4682, -/**/ - 4681, -/**/ - 4680, -/**/ - 4679, -/**/ - 4678, -/**/ - 4677, -/**/ - 4676, -/**/ - 4675, -/**/ - 4674, -/**/ - 4673, -/**/ - 4672, -/**/ - 4671, -/**/ - 4670, -/**/ - 4669, -/**/ - 4668, -/**/ - 4667, -/**/ - 4666, -/**/ - 4665, -/**/ - 4664, -/**/ - 4663, -/**/ - 4662, -/**/ - 4661, -/**/ - 4660, -/**/ - 4659, -/**/ - 4658, -/**/ - 4657, -/**/ - 4656, -/**/ - 4655, -/**/ - 4654, -/**/ - 4653, -/**/ - 4652, -/**/ - 4651, -/**/ - 4650, -/**/ - 4649, -/**/ - 4648, -/**/ - 4647, -/**/ - 4646, -/**/ - 4645, -/**/ - 4644, -/**/ - 4643, -/**/ - 4642, -/**/ - 4641, -/**/ - 4640, -/**/ - 4639, -/**/ - 4638, -/**/ - 4637, -/**/ - 4636, -/**/ - 4635, -/**/ - 4634, -/**/ - 4633, -/**/ - 4632, -/**/ - 4631, -/**/ - 4630, -/**/ - 4629, -/**/ - 4628, -/**/ - 4627, -/**/ - 4626, -/**/ - 4625, -/**/ - 4624, -/**/ - 4623, -/**/ - 4622, -/**/ - 4621, -/**/ - 4620, -/**/ - 4619, -/**/ - 4618, -/**/ - 4617, -/**/ - 4616, -/**/ - 4615, -/**/ - 4614, -/**/ - 4613, -/**/ - 4612, -/**/ - 4611, -/**/ - 4610, -/**/ - 4609, -/**/ - 4608, -/**/ - 4607, -/**/ - 4606, -/**/ - 4605, -/**/ - 4604, -/**/ - 4603, -/**/ - 4602, -/**/ - 4601, -/**/ - 4600, -/**/ - 4599, -/**/ - 4598, -/**/ - 4597, -/**/ - 4596, -/**/ - 4595, -/**/ - 4594, -/**/ - 4593, -/**/ - 4592, -/**/ - 4591, -/**/ - 4590, -/**/ - 4589, -/**/ - 4588, -/**/ - 4587, -/**/ - 4586, -/**/ - 4585, -/**/ - 4584, -/**/ - 4583, -/**/ - 4582, -/**/ - 4581, -/**/ - 4580, -/**/ - 4579, -/**/ - 4578, -/**/ - 4577, -/**/ - 4576, -/**/ - 4575, -/**/ - 4574, -/**/ - 4573, -/**/ - 4572, -/**/ - 4571, -/**/ - 4570, -/**/ - 4569, -/**/ - 4568, -/**/ - 4567, -/**/ - 4566, -/**/ - 4565, -/**/ - 4564, -/**/ - 4563, -/**/ - 4562, -/**/ - 4561, -/**/ - 4560, -/**/ - 4559, -/**/ - 4558, -/**/ - 4557, -/**/ - 4556, -/**/ - 4555, -/**/ - 4554, -/**/ - 4553, -/**/ - 4552, -/**/ - 4551, -/**/ - 4550, -/**/ - 4549, -/**/ - 4548, -/**/ - 4547, -/**/ - 4546, -/**/ - 4545, -/**/ - 4544, -/**/ - 4543, -/**/ - 4542, -/**/ - 4541, -/**/ - 4540, -/**/ - 4539, -/**/ - 4538, -/**/ - 4537, -/**/ - 4536, -/**/ - 4535, -/**/ - 4534, -/**/ - 4533, -/**/ - 4532, -/**/ - 4531, -/**/ - 4530, -/**/ - 4529, -/**/ - 4528, -/**/ - 4527, -/**/ - 4526, -/**/ - 4525, -/**/ - 4524, -/**/ - 4523, -/**/ - 4522, -/**/ - 4521, -/**/ - 4520, -/**/ - 4519, -/**/ - 4518, -/**/ - 4517, -/**/ - 4516, -/**/ - 4515, -/**/ - 4514, -/**/ - 4513, -/**/ - 4512, -/**/ - 4511, -/**/ - 4510, -/**/ - 4509, -/**/ - 4508, -/**/ - 4507, -/**/ - 4506, -/**/ - 4505, -/**/ - 4504, -/**/ - 4503, -/**/ - 4502, -/**/ - 4501, -/**/ - 4500, -/**/ - 4499, -/**/ - 4498, -/**/ - 4497, -/**/ - 4496, -/**/ - 4495, -/**/ - 4494, -/**/ - 4493, -/**/ - 4492, -/**/ - 4491, -/**/ - 4490, -/**/ - 4489, -/**/ - 4488, -/**/ - 4487, -/**/ - 4486, -/**/ - 4485, -/**/ - 4484, -/**/ - 4483, -/**/ - 4482, -/**/ - 4481, -/**/ - 4480, -/**/ - 4479, -/**/ - 4478, -/**/ - 4477, -/**/ - 4476, -/**/ - 4475, -/**/ - 4474, -/**/ - 4473, -/**/ - 4472, -/**/ - 4471, -/**/ - 4470, -/**/ - 4469, -/**/ - 4468, -/**/ - 4467, -/**/ - 4466, -/**/ - 4465, -/**/ - 4464, -/**/ - 4463, -/**/ - 4462, -/**/ - 4461, -/**/ - 4460, -/**/ - 4459, -/**/ - 4458, -/**/ - 4457, -/**/ - 4456, -/**/ - 4455, -/**/ - 4454, -/**/ - 4453, -/**/ - 4452, -/**/ - 4451, -/**/ - 4450, -/**/ - 4449, -/**/ - 4448, -/**/ - 4447, -/**/ - 4446, -/**/ - 4445, -/**/ - 4444, -/**/ - 4443, -/**/ - 4442, -/**/ - 4441, -/**/ - 4440, -/**/ - 4439, -/**/ - 4438, -/**/ - 4437, -/**/ - 4436, -/**/ - 4435, -/**/ - 4434, -/**/ - 4433, -/**/ - 4432, -/**/ - 4431, -/**/ - 4430, -/**/ - 4429, -/**/ - 4428, -/**/ - 4427, -/**/ - 4426, -/**/ - 4425, -/**/ - 4424, -/**/ - 4423, -/**/ - 4422, -/**/ - 4421, -/**/ - 4420, -/**/ - 4419, -/**/ - 4418, -/**/ - 4417, -/**/ - 4416, -/**/ - 4415, -/**/ - 4414, -/**/ - 4413, -/**/ - 4412, -/**/ - 4411, -/**/ - 4410, -/**/ - 4409, -/**/ - 4408, -/**/ - 4407, -/**/ - 4406, -/**/ - 4405, -/**/ - 4404, -/**/ - 4403, -/**/ - 4402, -/**/ - 4401, -/**/ - 4400, -/**/ - 4399, -/**/ - 4398, -/**/ - 4397, -/**/ - 4396, -/**/ - 4395, -/**/ - 4394, -/**/ - 4393, -/**/ - 4392, -/**/ - 4391, -/**/ - 4390, -/**/ - 4389, -/**/ - 4388, -/**/ - 4387, -/**/ - 4386, -/**/ - 4385, -/**/ - 4384, -/**/ - 4383, -/**/ - 4382, -/**/ - 4381, -/**/ - 4380, -/**/ - 4379, -/**/ - 4378, -/**/ - 4377, -/**/ - 4376, -/**/ - 4375, -/**/ - 4374, -/**/ - 4373, -/**/ - 4372, -/**/ - 4371, -/**/ - 4370, -/**/ - 4369, -/**/ - 4368, -/**/ - 4367, -/**/ - 4366, -/**/ - 4365, -/**/ - 4364, -/**/ - 4363, -/**/ - 4362, -/**/ - 4361, -/**/ - 4360, -/**/ - 4359, -/**/ - 4358, -/**/ - 4357, -/**/ - 4356, -/**/ - 4355, -/**/ - 4354, -/**/ - 4353, -/**/ - 4352, -/**/ - 4351, -/**/ - 4350, -/**/ - 4349, -/**/ - 4348, -/**/ - 4347, -/**/ - 4346, -/**/ - 4345, -/**/ - 4344, -/**/ - 4343, -/**/ - 4342, -/**/ - 4341, -/**/ - 4340, -/**/ - 4339, -/**/ - 4338, -/**/ - 4337, -/**/ - 4336, -/**/ - 4335, -/**/ - 4334, -/**/ - 4333, -/**/ - 4332, -/**/ - 4331, -/**/ - 4330, -/**/ - 4329, -/**/ - 4328, -/**/ - 4327, -/**/ - 4326, -/**/ - 4325, -/**/ - 4324, -/**/ - 4323, -/**/ - 4322, -/**/ - 4321, -/**/ - 4320, -/**/ - 4319, -/**/ - 4318, -/**/ - 4317, -/**/ - 4316, -/**/ - 4315, -/**/ - 4314, -/**/ - 4313, -/**/ - 4312, -/**/ - 4311, -/**/ - 4310, -/**/ - 4309, -/**/ - 4308, -/**/ - 4307, -/**/ - 4306, -/**/ - 4305, -/**/ - 4304, -/**/ - 4303, -/**/ - 4302, -/**/ - 4301, -/**/ - 4300, -/**/ - 4299, -/**/ - 4298, -/**/ - 4297, -/**/ - 4296, -/**/ - 4295, -/**/ - 4294, -/**/ - 4293, -/**/ - 4292, -/**/ - 4291, -/**/ - 4290, -/**/ - 4289, -/**/ - 4288, -/**/ - 4287, -/**/ - 4286, -/**/ - 4285, -/**/ - 4284, -/**/ - 4283, -/**/ - 4282, -/**/ - 4281, -/**/ - 4280, -/**/ - 4279, -/**/ - 4278, -/**/ - 4277, -/**/ - 4276, -/**/ - 4275, -/**/ - 4274, -/**/ - 4273, -/**/ - 4272, -/**/ - 4271, -/**/ - 4270, -/**/ - 4269, -/**/ - 4268, -/**/ - 4267, -/**/ - 4266, -/**/ - 4265, -/**/ - 4264, -/**/ - 4263, -/**/ - 4262, -/**/ - 4261, -/**/ - 4260, -/**/ - 4259, -/**/ - 4258, -/**/ - 4257, -/**/ - 4256, -/**/ - 4255, -/**/ - 4254, -/**/ - 4253, -/**/ - 4252, -/**/ - 4251, -/**/ - 4250, -/**/ - 4249, -/**/ - 4248, -/**/ - 4247, -/**/ - 4246, -/**/ - 4245, -/**/ - 4244, -/**/ - 4243, -/**/ - 4242, -/**/ - 4241, -/**/ - 4240, -/**/ - 4239, -/**/ - 4238, -/**/ - 4237, -/**/ - 4236, -/**/ - 4235, -/**/ - 4234, -/**/ - 4233, -/**/ - 4232, -/**/ - 4231, -/**/ - 4230, -/**/ - 4229, -/**/ - 4228, -/**/ - 4227, -/**/ - 4226, -/**/ - 4225, -/**/ - 4224, -/**/ - 4223, -/**/ - 4222, -/**/ - 4221, -/**/ - 4220, -/**/ - 4219, -/**/ - 4218, -/**/ - 4217, -/**/ - 4216, -/**/ - 4215, -/**/ - 4214, -/**/ - 4213, -/**/ - 4212, -/**/ - 4211, -/**/ - 4210, -/**/ - 4209, -/**/ - 4208, -/**/ - 4207, -/**/ - 4206, -/**/ - 4205, -/**/ - 4204, -/**/ - 4203, -/**/ - 4202, -/**/ - 4201, -/**/ - 4200, -/**/ - 4199, -/**/ - 4198, -/**/ - 4197, -/**/ - 4196, -/**/ - 4195, -/**/ - 4194, -/**/ - 4193, -/**/ - 4192, -/**/ - 4191, -/**/ - 4190, -/**/ - 4189, -/**/ - 4188, -/**/ - 4187, -/**/ - 4186, -/**/ - 4185, -/**/ - 4184, -/**/ - 4183, -/**/ - 4182, -/**/ - 4181, -/**/ - 4180, -/**/ - 4179, -/**/ - 4178, -/**/ - 4177, -/**/ - 4176, -/**/ - 4175, -/**/ - 4174, -/**/ - 4173, -/**/ - 4172, -/**/ - 4171, -/**/ - 4170, -/**/ - 4169, -/**/ - 4168, -/**/ - 4167, -/**/ - 4166, -/**/ - 4165, -/**/ - 4164, -/**/ - 4163, -/**/ - 4162, -/**/ - 4161, -/**/ - 4160, -/**/ - 4159, -/**/ - 4158, -/**/ - 4157, -/**/ - 4156, -/**/ - 4155, -/**/ - 4154, -/**/ - 4153, -/**/ - 4152, -/**/ - 4151, -/**/ - 4150, -/**/ - 4149, -/**/ - 4148, -/**/ - 4147, -/**/ - 4146, -/**/ - 4145, -/**/ - 4144, -/**/ - 4143, -/**/ - 4142, -/**/ - 4141, -/**/ - 4140, -/**/ - 4139, -/**/ - 4138, -/**/ - 4137, -/**/ - 4136, -/**/ - 4135, -/**/ - 4134, -/**/ - 4133, -/**/ - 4132, -/**/ - 4131, -/**/ - 4130, -/**/ - 4129, -/**/ - 4128, -/**/ - 4127, -/**/ - 4126, -/**/ - 4125, -/**/ - 4124, -/**/ - 4123, -/**/ - 4122, -/**/ - 4121, -/**/ - 4120, -/**/ - 4119, -/**/ - 4118, -/**/ - 4117, -/**/ - 4116, -/**/ - 4115, -/**/ - 4114, -/**/ - 4113, -/**/ - 4112, -/**/ - 4111, -/**/ - 4110, -/**/ - 4109, -/**/ - 4108, -/**/ - 4107, -/**/ - 4106, -/**/ - 4105, -/**/ - 4104, -/**/ - 4103, -/**/ - 4102, -/**/ - 4101, -/**/ - 4100, -/**/ - 4099, -/**/ - 4098, -/**/ - 4097, -/**/ - 4096, -/**/ - 4095, -/**/ - 4094, -/**/ - 4093, -/**/ - 4092, -/**/ - 4091, -/**/ - 4090, -/**/ - 4089, -/**/ - 4088, -/**/ - 4087, -/**/ - 4086, -/**/ - 4085, -/**/ - 4084, -/**/ - 4083, -/**/ - 4082, -/**/ - 4081, -/**/ - 4080, -/**/ - 4079, -/**/ - 4078, -/**/ - 4077, -/**/ - 4076, -/**/ - 4075, -/**/ - 4074, -/**/ - 4073, -/**/ - 4072, -/**/ - 4071, -/**/ - 4070, -/**/ - 4069, -/**/ - 4068, -/**/ - 4067, -/**/ - 4066, -/**/ - 4065, -/**/ - 4064, -/**/ - 4063, -/**/ - 4062, -/**/ - 4061, -/**/ - 4060, -/**/ - 4059, -/**/ - 4058, -/**/ - 4057, -/**/ - 4056, -/**/ - 4055, -/**/ - 4054, -/**/ - 4053, -/**/ - 4052, -/**/ - 4051, -/**/ - 4050, -/**/ - 4049, -/**/ - 4048, -/**/ - 4047, -/**/ - 4046, -/**/ - 4045, -/**/ - 4044, -/**/ - 4043, -/**/ - 4042, -/**/ - 4041, -/**/ - 4040, -/**/ - 4039, -/**/ - 4038, -/**/ - 4037, -/**/ - 4036, -/**/ - 4035, -/**/ - 4034, -/**/ - 4033, -/**/ - 4032, -/**/ - 4031, -/**/ - 4030, -/**/ - 4029, -/**/ - 4028, -/**/ - 4027, -/**/ - 4026, -/**/ - 4025, -/**/ - 4024, -/**/ - 4023, -/**/ - 4022, -/**/ - 4021, -/**/ - 4020, -/**/ - 4019, -/**/ - 4018, -/**/ - 4017, -/**/ - 4016, -/**/ - 4015, -/**/ - 4014, -/**/ - 4013, -/**/ - 4012, -/**/ - 4011, -/**/ - 4010, -/**/ - 4009, -/**/ - 4008, -/**/ - 4007, -/**/ - 4006, -/**/ - 4005, -/**/ - 4004, -/**/ - 4003, -/**/ - 4002, -/**/ - 4001, -/**/ - 4000, -/**/ - 3999, -/**/ - 3998, -/**/ - 3997, -/**/ - 3996, -/**/ - 3995, -/**/ - 3994, -/**/ - 3993, -/**/ - 3992, -/**/ - 3991, -/**/ - 3990, -/**/ - 3989, -/**/ - 3988, -/**/ - 3987, -/**/ - 3986, -/**/ - 3985, -/**/ - 3984, -/**/ - 3983, -/**/ - 3982, -/**/ - 3981, -/**/ - 3980, -/**/ - 3979, -/**/ - 3978, -/**/ - 3977, -/**/ - 3976, -/**/ - 3975, -/**/ - 3974, -/**/ - 3973, -/**/ - 3972, -/**/ - 3971, -/**/ - 3970, -/**/ - 3969, -/**/ - 3968, -/**/ - 3967, -/**/ - 3966, -/**/ - 3965, -/**/ - 3964, -/**/ - 3963, -/**/ - 3962, -/**/ - 3961, -/**/ - 3960, -/**/ - 3959, -/**/ - 3958, -/**/ - 3957, -/**/ - 3956, -/**/ - 3955, -/**/ - 3954, -/**/ - 3953, -/**/ - 3952, -/**/ - 3951, -/**/ - 3950, -/**/ - 3949, -/**/ - 3948, -/**/ - 3947, -/**/ - 3946, -/**/ - 3945, -/**/ - 3944, -/**/ - 3943, -/**/ - 3942, -/**/ - 3941, -/**/ - 3940, -/**/ - 3939, -/**/ - 3938, -/**/ - 3937, -/**/ - 3936, -/**/ - 3935, -/**/ - 3934, -/**/ - 3933, -/**/ - 3932, -/**/ - 3931, -/**/ - 3930, -/**/ - 3929, -/**/ - 3928, -/**/ - 3927, -/**/ - 3926, -/**/ - 3925, -/**/ - 3924, -/**/ - 3923, -/**/ - 3922, -/**/ - 3921, -/**/ - 3920, -/**/ - 3919, -/**/ - 3918, -/**/ - 3917, -/**/ - 3916, -/**/ - 3915, -/**/ - 3914, -/**/ - 3913, -/**/ - 3912, -/**/ - 3911, -/**/ - 3910, -/**/ - 3909, -/**/ - 3908, -/**/ - 3907, -/**/ - 3906, -/**/ - 3905, -/**/ - 3904, -/**/ - 3903, -/**/ - 3902, -/**/ - 3901, -/**/ - 3900, -/**/ - 3899, -/**/ - 3898, -/**/ - 3897, -/**/ - 3896, -/**/ - 3895, -/**/ - 3894, -/**/ - 3893, -/**/ - 3892, -/**/ - 3891, -/**/ - 3890, -/**/ - 3889, -/**/ - 3888, -/**/ - 3887, -/**/ - 3886, -/**/ - 3885, -/**/ - 3884, -/**/ - 3883, -/**/ - 3882, -/**/ - 3881, -/**/ - 3880, -/**/ - 3879, -/**/ - 3878, -/**/ - 3877, -/**/ - 3876, -/**/ - 3875, -/**/ - 3874, -/**/ - 3873, -/**/ - 3872, -/**/ - 3871, -/**/ - 3870, -/**/ - 3869, -/**/ - 3868, -/**/ - 3867, -/**/ - 3866, -/**/ - 3865, -/**/ - 3864, -/**/ - 3863, -/**/ - 3862, -/**/ - 3861, -/**/ - 3860, -/**/ - 3859, -/**/ - 3858, -/**/ - 3857, -/**/ - 3856, -/**/ - 3855, -/**/ - 3854, -/**/ - 3853, -/**/ - 3852, -/**/ - 3851, -/**/ - 3850, -/**/ - 3849, -/**/ - 3848, -/**/ - 3847, -/**/ - 3846, -/**/ - 3845, -/**/ - 3844, -/**/ - 3843, -/**/ - 3842, -/**/ - 3841, -/**/ - 3840, -/**/ - 3839, -/**/ - 3838, -/**/ - 3837, -/**/ - 3836, -/**/ - 3835, -/**/ - 3834, -/**/ - 3833, -/**/ - 3832, -/**/ - 3831, -/**/ - 3830, -/**/ - 3829, -/**/ - 3828, -/**/ - 3827, -/**/ - 3826, -/**/ - 3825, -/**/ - 3824, -/**/ - 3823, -/**/ - 3822, -/**/ - 3821, -/**/ - 3820, -/**/ - 3819, -/**/ - 3818, -/**/ - 3817, -/**/ - 3816, -/**/ - 3815, -/**/ - 3814, -/**/ - 3813, -/**/ - 3812, -/**/ - 3811, -/**/ - 3810, -/**/ - 3809, -/**/ - 3808, -/**/ - 3807, -/**/ - 3806, -/**/ - 3805, -/**/ - 3804, -/**/ - 3803, -/**/ - 3802, -/**/ - 3801, -/**/ - 3800, -/**/ - 3799, -/**/ - 3798, -/**/ - 3797, -/**/ - 3796, -/**/ - 3795, -/**/ - 3794, -/**/ - 3793, -/**/ - 3792, -/**/ - 3791, -/**/ - 3790, -/**/ - 3789, -/**/ - 3788, -/**/ - 3787, -/**/ - 3786, -/**/ - 3785, -/**/ - 3784, -/**/ - 3783, -/**/ - 3782, -/**/ - 3781, -/**/ - 3780, -/**/ - 3779, -/**/ - 3778, -/**/ - 3777, -/**/ - 3776, -/**/ - 3775, -/**/ - 3774, -/**/ - 3773, -/**/ - 3772, -/**/ - 3771, -/**/ - 3770, -/**/ - 3769, -/**/ - 3768, -/**/ - 3767, -/**/ - 3766, -/**/ - 3765, -/**/ - 3764, -/**/ - 3763, -/**/ - 3762, -/**/ - 3761, -/**/ - 3760, -/**/ - 3759, -/**/ - 3758, -/**/ - 3757, -/**/ - 3756, -/**/ - 3755, -/**/ - 3754, -/**/ - 3753, -/**/ - 3752, -/**/ - 3751, -/**/ - 3750, -/**/ - 3749, -/**/ - 3748, -/**/ - 3747, -/**/ - 3746, -/**/ - 3745, -/**/ - 3744, -/**/ - 3743, -/**/ - 3742, -/**/ - 3741, -/**/ - 3740, -/**/ - 3739, -/**/ - 3738, -/**/ - 3737, -/**/ - 3736, -/**/ - 3735, -/**/ - 3734, -/**/ - 3733, -/**/ - 3732, -/**/ - 3731, -/**/ - 3730, -/**/ - 3729, -/**/ - 3728, -/**/ - 3727, -/**/ - 3726, -/**/ - 3725, -/**/ - 3724, -/**/ - 3723, -/**/ - 3722, -/**/ - 3721, -/**/ - 3720, -/**/ - 3719, -/**/ - 3718, -/**/ - 3717, -/**/ - 3716, -/**/ - 3715, -/**/ - 3714, -/**/ - 3713, -/**/ - 3712, -/**/ - 3711, -/**/ - 3710, -/**/ - 3709, -/**/ - 3708, -/**/ - 3707, -/**/ - 3706, -/**/ - 3705, -/**/ - 3704, -/**/ - 3703, -/**/ - 3702, -/**/ - 3701, -/**/ - 3700, -/**/ - 3699, -/**/ - 3698, -/**/ - 3697, -/**/ - 3696, -/**/ - 3695, -/**/ - 3694, -/**/ - 3693, -/**/ - 3692, -/**/ - 3691, -/**/ - 3690, -/**/ - 3689, -/**/ - 3688, -/**/ - 3687, -/**/ - 3686, -/**/ - 3685, -/**/ - 3684, -/**/ - 3683, -/**/ - 3682, -/**/ - 3681, -/**/ - 3680, -/**/ - 3679, -/**/ - 3678, -/**/ - 3677, -/**/ - 3676, -/**/ - 3675, -/**/ - 3674, -/**/ - 3673, -/**/ - 3672, -/**/ - 3671, -/**/ - 3670, -/**/ - 3669, -/**/ - 3668, -/**/ - 3667, -/**/ - 3666, -/**/ - 3665, -/**/ - 3664, -/**/ - 3663, -/**/ - 3662, -/**/ - 3661, -/**/ - 3660, -/**/ - 3659, -/**/ - 3658, -/**/ - 3657, -/**/ - 3656, -/**/ - 3655, -/**/ - 3654, -/**/ - 3653, -/**/ - 3652, -/**/ - 3651, -/**/ - 3650, -/**/ - 3649, -/**/ - 3648, -/**/ - 3647, -/**/ - 3646, -/**/ - 3645, -/**/ - 3644, -/**/ - 3643, -/**/ - 3642, -/**/ - 3641, -/**/ - 3640, -/**/ - 3639, -/**/ - 3638, -/**/ - 3637, -/**/ - 3636, -/**/ - 3635, -/**/ - 3634, -/**/ - 3633, -/**/ - 3632, -/**/ - 3631, -/**/ - 3630, -/**/ - 3629, -/**/ - 3628, -/**/ - 3627, -/**/ - 3626, -/**/ - 3625, -/**/ - 3624, -/**/ - 3623, -/**/ - 3622, -/**/ - 3621, -/**/ - 3620, -/**/ - 3619, -/**/ - 3618, -/**/ - 3617, -/**/ - 3616, -/**/ - 3615, -/**/ - 3614, -/**/ - 3613, -/**/ - 3612, -/**/ - 3611, -/**/ - 3610, -/**/ - 3609, -/**/ - 3608, -/**/ - 3607, -/**/ - 3606, -/**/ - 3605, -/**/ - 3604, -/**/ - 3603, -/**/ - 3602, -/**/ - 3601, -/**/ - 3600, -/**/ - 3599, -/**/ - 3598, -/**/ - 3597, -/**/ - 3596, -/**/ - 3595, -/**/ - 3594, -/**/ - 3593, -/**/ - 3592, -/**/ - 3591, -/**/ - 3590, -/**/ - 3589, -/**/ - 3588, -/**/ - 3587, -/**/ - 3586, -/**/ - 3585, -/**/ - 3584, -/**/ - 3583, -/**/ - 3582, -/**/ - 3581, -/**/ - 3580, -/**/ - 3579, -/**/ - 3578, -/**/ - 3577, -/**/ - 3576, -/**/ - 3575, -/**/ - 3574, -/**/ - 3573, -/**/ - 3572, -/**/ - 3571, -/**/ - 3570, -/**/ - 3569, -/**/ - 3568, -/**/ - 3567, -/**/ - 3566, -/**/ - 3565, -/**/ - 3564, -/**/ - 3563, -/**/ - 3562, -/**/ - 3561, -/**/ - 3560, -/**/ - 3559, -/**/ - 3558, -/**/ - 3557, -/**/ - 3556, -/**/ - 3555, -/**/ - 3554, -/**/ - 3553, -/**/ - 3552, -/**/ - 3551, -/**/ - 3550, -/**/ - 3549, -/**/ - 3548, -/**/ - 3547, -/**/ - 3546, -/**/ - 3545, -/**/ - 3544, -/**/ - 3543, -/**/ - 3542, -/**/ - 3541, -/**/ - 3540, -/**/ - 3539, -/**/ - 3538, -/**/ - 3537, -/**/ - 3536, -/**/ - 3535, -/**/ - 3534, -/**/ - 3533, -/**/ - 3532, -/**/ - 3531, -/**/ - 3530, -/**/ - 3529, -/**/ - 3528, -/**/ - 3527, -/**/ - 3526, -/**/ - 3525, -/**/ - 3524, -/**/ - 3523, -/**/ - 3522, -/**/ - 3521, -/**/ - 3520, -/**/ - 3519, -/**/ - 3518, -/**/ - 3517, -/**/ - 3516, -/**/ - 3515, -/**/ - 3514, -/**/ - 3513, -/**/ - 3512, -/**/ - 3511, -/**/ - 3510, -/**/ - 3509, -/**/ - 3508, -/**/ - 3507, -/**/ - 3506, -/**/ - 3505, -/**/ - 3504, -/**/ - 3503, -/**/ - 3502, -/**/ - 3501, -/**/ - 3500, -/**/ - 3499, -/**/ - 3498, -/**/ - 3497, -/**/ - 3496, -/**/ - 3495, -/**/ - 3494, -/**/ - 3493, -/**/ - 3492, -/**/ - 3491, -/**/ - 3490, -/**/ - 3489, -/**/ - 3488, -/**/ - 3487, -/**/ - 3486, -/**/ - 3485, -/**/ - 3484, -/**/ - 3483, -/**/ - 3482, -/**/ - 3481, -/**/ - 3480, -/**/ - 3479, -/**/ - 3478, -/**/ - 3477, -/**/ - 3476, -/**/ - 3475, -/**/ - 3474, -/**/ - 3473, -/**/ - 3472, -/**/ - 3471, -/**/ - 3470, -/**/ - 3469, -/**/ - 3468, -/**/ - 3467, -/**/ - 3466, -/**/ - 3465, -/**/ - 3464, -/**/ - 3463, -/**/ - 3462, -/**/ - 3461, -/**/ - 3460, -/**/ - 3459, -/**/ - 3458, -/**/ - 3457, -/**/ - 3456, -/**/ - 3455, -/**/ - 3454, -/**/ - 3453, -/**/ - 3452, -/**/ - 3451, -/**/ - 3450, -/**/ - 3449, -/**/ - 3448, -/**/ - 3447, -/**/ - 3446, -/**/ - 3445, -/**/ - 3444, -/**/ - 3443, -/**/ - 3442, -/**/ - 3441, -/**/ - 3440, -/**/ - 3439, -/**/ - 3438, -/**/ - 3437, -/**/ - 3436, -/**/ - 3435, -/**/ - 3434, -/**/ - 3433, -/**/ - 3432, -/**/ - 3431, -/**/ - 3430, -/**/ - 3429, -/**/ - 3428, -/**/ - 3427, -/**/ - 3426, -/**/ - 3425, -/**/ - 3424, -/**/ - 3423, -/**/ - 3422, -/**/ - 3421, -/**/ - 3420, -/**/ - 3419, -/**/ - 3418, -/**/ - 3417, -/**/ - 3416, -/**/ - 3415, -/**/ - 3414, -/**/ - 3413, -/**/ - 3412, -/**/ - 3411, -/**/ - 3410, -/**/ - 3409, -/**/ - 3408, -/**/ - 3407, -/**/ - 3406, -/**/ - 3405, -/**/ - 3404, -/**/ - 3403, -/**/ - 3402, -/**/ - 3401, -/**/ - 3400, -/**/ - 3399, -/**/ - 3398, -/**/ - 3397, -/**/ - 3396, -/**/ - 3395, -/**/ - 3394, -/**/ - 3393, -/**/ - 3392, -/**/ - 3391, -/**/ - 3390, -/**/ - 3389, -/**/ - 3388, -/**/ - 3387, -/**/ - 3386, -/**/ - 3385, -/**/ - 3384, -/**/ - 3383, -/**/ - 3382, -/**/ - 3381, -/**/ - 3380, -/**/ - 3379, -/**/ - 3378, -/**/ - 3377, -/**/ - 3376, -/**/ - 3375, -/**/ - 3374, -/**/ - 3373, -/**/ - 3372, -/**/ - 3371, -/**/ - 3370, -/**/ - 3369, -/**/ - 3368, -/**/ - 3367, -/**/ - 3366, -/**/ - 3365, -/**/ - 3364, -/**/ - 3363, -/**/ - 3362, -/**/ - 3361, -/**/ - 3360, -/**/ - 3359, -/**/ - 3358, -/**/ - 3357, -/**/ - 3356, -/**/ - 3355, -/**/ - 3354, -/**/ - 3353, -/**/ - 3352, -/**/ - 3351, -/**/ - 3350, -/**/ - 3349, -/**/ - 3348, -/**/ - 3347, -/**/ - 3346, -/**/ - 3345, -/**/ - 3344, -/**/ - 3343, -/**/ - 3342, -/**/ - 3341, -/**/ - 3340, -/**/ - 3339, -/**/ - 3338, -/**/ - 3337, -/**/ - 3336, -/**/ - 3335, -/**/ - 3334, -/**/ - 3333, -/**/ - 3332, -/**/ - 3331, -/**/ - 3330, -/**/ - 3329, -/**/ - 3328, -/**/ - 3327, -/**/ - 3326, -/**/ - 3325, -/**/ - 3324, -/**/ - 3323, -/**/ - 3322, -/**/ - 3321, -/**/ - 3320, -/**/ - 3319, -/**/ - 3318, -/**/ - 3317, -/**/ - 3316, -/**/ - 3315, -/**/ - 3314, -/**/ - 3313, -/**/ - 3312, -/**/ - 3311, -/**/ - 3310, -/**/ - 3309, -/**/ - 3308, -/**/ - 3307, -/**/ - 3306, -/**/ - 3305, -/**/ - 3304, -/**/ - 3303, -/**/ - 3302, -/**/ - 3301, -/**/ - 3300, -/**/ - 3299, -/**/ - 3298, -/**/ - 3297, -/**/ - 3296, -/**/ - 3295, -/**/ - 3294, -/**/ - 3293, -/**/ - 3292, -/**/ - 3291, -/**/ - 3290, -/**/ - 3289, -/**/ - 3288, -/**/ - 3287, -/**/ - 3286, -/**/ - 3285, -/**/ - 3284, -/**/ - 3283, -/**/ - 3282, -/**/ - 3281, -/**/ - 3280, -/**/ - 3279, -/**/ - 3278, -/**/ - 3277, -/**/ - 3276, -/**/ - 3275, -/**/ - 3274, -/**/ - 3273, -/**/ - 3272, -/**/ - 3271, -/**/ - 3270, -/**/ - 3269, -/**/ - 3268, -/**/ - 3267, -/**/ - 3266, -/**/ - 3265, -/**/ - 3264, -/**/ - 3263, -/**/ - 3262, -/**/ - 3261, -/**/ - 3260, -/**/ - 3259, -/**/ - 3258, -/**/ - 3257, -/**/ - 3256, -/**/ - 3255, -/**/ - 3254, -/**/ - 3253, -/**/ - 3252, -/**/ - 3251, -/**/ - 3250, -/**/ - 3249, -/**/ - 3248, -/**/ - 3247, -/**/ - 3246, -/**/ - 3245, -/**/ - 3244, -/**/ - 3243, -/**/ - 3242, -/**/ - 3241, -/**/ - 3240, -/**/ - 3239, -/**/ - 3238, -/**/ - 3237, -/**/ - 3236, -/**/ - 3235, -/**/ - 3234, -/**/ - 3233, -/**/ - 3232, -/**/ - 3231, -/**/ - 3230, -/**/ - 3229, -/**/ - 3228, -/**/ - 3227, -/**/ - 3226, -/**/ - 3225, -/**/ - 3224, -/**/ - 3223, -/**/ - 3222, -/**/ - 3221, -/**/ - 3220, -/**/ - 3219, -/**/ - 3218, -/**/ - 3217, -/**/ - 3216, -/**/ - 3215, -/**/ - 3214, -/**/ - 3213, -/**/ - 3212, -/**/ - 3211, -/**/ - 3210, -/**/ - 3209, -/**/ - 3208, -/**/ - 3207, -/**/ - 3206, -/**/ - 3205, -/**/ - 3204, -/**/ - 3203, -/**/ - 3202, -/**/ - 3201, -/**/ - 3200, -/**/ - 3199, -/**/ - 3198, -/**/ - 3197, -/**/ - 3196, -/**/ - 3195, -/**/ - 3194, -/**/ - 3193, -/**/ - 3192, -/**/ - 3191, -/**/ - 3190, -/**/ - 3189, -/**/ - 3188, -/**/ - 3187, -/**/ - 3186, -/**/ - 3185, -/**/ - 3184, -/**/ - 3183, -/**/ - 3182, -/**/ - 3181, -/**/ - 3180, -/**/ - 3179, -/**/ - 3178, -/**/ - 3177, -/**/ - 3176, -/**/ - 3175, -/**/ - 3174, -/**/ - 3173, -/**/ - 3172, -/**/ - 3171, -/**/ - 3170, -/**/ - 3169, -/**/ - 3168, -/**/ - 3167, -/**/ - 3166, -/**/ - 3165, -/**/ - 3164, -/**/ - 3163, -/**/ - 3162, -/**/ - 3161, -/**/ - 3160, -/**/ - 3159, -/**/ - 3158, -/**/ - 3157, -/**/ - 3156, -/**/ - 3155, -/**/ - 3154, -/**/ - 3153, -/**/ - 3152, -/**/ - 3151, -/**/ - 3150, -/**/ - 3149, -/**/ - 3148, -/**/ - 3147, -/**/ - 3146, -/**/ - 3145, -/**/ - 3144, -/**/ - 3143, -/**/ - 3142, -/**/ - 3141, -/**/ - 3140, -/**/ - 3139, -/**/ - 3138, -/**/ - 3137, -/**/ - 3136, -/**/ - 3135, -/**/ - 3134, -/**/ - 3133, -/**/ - 3132, -/**/ - 3131, -/**/ - 3130, -/**/ - 3129, -/**/ - 3128, -/**/ - 3127, -/**/ - 3126, -/**/ - 3125, -/**/ - 3124, -/**/ - 3123, -/**/ - 3122, -/**/ - 3121, -/**/ - 3120, -/**/ - 3119, -/**/ - 3118, -/**/ - 3117, -/**/ - 3116, -/**/ - 3115, -/**/ - 3114, -/**/ - 3113, -/**/ - 3112, -/**/ - 3111, -/**/ - 3110, -/**/ - 3109, -/**/ - 3108, -/**/ - 3107, -/**/ - 3106, -/**/ - 3105, -/**/ - 3104, -/**/ - 3103, -/**/ - 3102, -/**/ - 3101, -/**/ - 3100, -/**/ - 3099, -/**/ - 3098, -/**/ - 3097, -/**/ - 3096, -/**/ - 3095, -/**/ - 3094, -/**/ - 3093, -/**/ - 3092, -/**/ - 3091, -/**/ - 3090, -/**/ - 3089, -/**/ - 3088, -/**/ - 3087, -/**/ - 3086, -/**/ - 3085, -/**/ - 3084, -/**/ - 3083, -/**/ - 3082, -/**/ - 3081, -/**/ - 3080, -/**/ - 3079, -/**/ - 3078, -/**/ - 3077, -/**/ - 3076, -/**/ - 3075, -/**/ - 3074, -/**/ - 3073, -/**/ - 3072, -/**/ - 3071, -/**/ - 3070, -/**/ - 3069, -/**/ - 3068, -/**/ - 3067, -/**/ - 3066, -/**/ - 3065, -/**/ - 3064, -/**/ - 3063, -/**/ - 3062, -/**/ - 3061, -/**/ - 3060, -/**/ - 3059, -/**/ - 3058, -/**/ - 3057, -/**/ - 3056, -/**/ - 3055, -/**/ - 3054, -/**/ - 3053, -/**/ - 3052, -/**/ - 3051, -/**/ - 3050, -/**/ - 3049, -/**/ - 3048, -/**/ - 3047, -/**/ - 3046, -/**/ - 3045, -/**/ - 3044, -/**/ - 3043, -/**/ - 3042, -/**/ - 3041, -/**/ - 3040, -/**/ - 3039, -/**/ - 3038, -/**/ - 3037, -/**/ - 3036, -/**/ - 3035, -/**/ - 3034, -/**/ - 3033, -/**/ - 3032, -/**/ - 3031, -/**/ - 3030, -/**/ - 3029, -/**/ - 3028, -/**/ - 3027, -/**/ - 3026, -/**/ - 3025, -/**/ - 3024, -/**/ - 3023, -/**/ - 3022, -/**/ - 3021, -/**/ - 3020, -/**/ - 3019, -/**/ - 3018, -/**/ - 3017, -/**/ - 3016, -/**/ - 3015, -/**/ - 3014, -/**/ - 3013, -/**/ - 3012, -/**/ - 3011, -/**/ - 3010, -/**/ - 3009, -/**/ - 3008, -/**/ - 3007, -/**/ - 3006, -/**/ - 3005, -/**/ - 3004, -/**/ - 3003, -/**/ - 3002, -/**/ - 3001, -/**/ - 3000, -/**/ - 2999, -/**/ - 2998, -/**/ - 2997, -/**/ - 2996, -/**/ - 2995, -/**/ - 2994, -/**/ - 2993, -/**/ - 2992, -/**/ - 2991, -/**/ - 2990, -/**/ - 2989, -/**/ - 2988, -/**/ - 2987, -/**/ - 2986, -/**/ - 2985, -/**/ - 2984, -/**/ - 2983, -/**/ - 2982, -/**/ - 2981, -/**/ - 2980, -/**/ - 2979, -/**/ - 2978, -/**/ - 2977, -/**/ - 2976, -/**/ - 2975, -/**/ - 2974, -/**/ - 2973, -/**/ - 2972, -/**/ - 2971, -/**/ - 2970, -/**/ - 2969, -/**/ - 2968, -/**/ - 2967, -/**/ - 2966, -/**/ - 2965, -/**/ - 2964, -/**/ - 2963, -/**/ - 2962, -/**/ - 2961, -/**/ - 2960, -/**/ - 2959, -/**/ - 2958, -/**/ - 2957, -/**/ - 2956, -/**/ - 2955, -/**/ - 2954, -/**/ - 2953, -/**/ - 2952, -/**/ - 2951, -/**/ - 2950, -/**/ - 2949, -/**/ - 2948, -/**/ - 2947, -/**/ - 2946, -/**/ - 2945, -/**/ - 2944, -/**/ - 2943, -/**/ - 2942, -/**/ - 2941, -/**/ - 2940, -/**/ - 2939, -/**/ - 2938, -/**/ - 2937, -/**/ - 2936, -/**/ - 2935, -/**/ - 2934, -/**/ - 2933, -/**/ - 2932, -/**/ - 2931, -/**/ - 2930, -/**/ - 2929, -/**/ - 2928, -/**/ - 2927, -/**/ - 2926, -/**/ - 2925, -/**/ - 2924, -/**/ - 2923, -/**/ - 2922, -/**/ - 2921, -/**/ - 2920, -/**/ - 2919, -/**/ - 2918, -/**/ - 2917, -/**/ - 2916, -/**/ - 2915, -/**/ - 2914, -/**/ - 2913, -/**/ - 2912, -/**/ - 2911, -/**/ - 2910, -/**/ - 2909, -/**/ - 2908, -/**/ - 2907, -/**/ - 2906, -/**/ - 2905, -/**/ - 2904, -/**/ - 2903, -/**/ - 2902, -/**/ - 2901, -/**/ - 2900, -/**/ - 2899, -/**/ - 2898, -/**/ - 2897, -/**/ - 2896, -/**/ - 2895, -/**/ - 2894, -/**/ - 2893, -/**/ - 2892, -/**/ - 2891, -/**/ - 2890, -/**/ - 2889, -/**/ - 2888, -/**/ - 2887, -/**/ - 2886, -/**/ - 2885, -/**/ - 2884, -/**/ - 2883, -/**/ - 2882, -/**/ - 2881, -/**/ - 2880, -/**/ - 2879, -/**/ - 2878, -/**/ - 2877, -/**/ - 2876, -/**/ - 2875, -/**/ - 2874, -/**/ - 2873, -/**/ - 2872, -/**/ - 2871, -/**/ - 2870, -/**/ - 2869, -/**/ - 2868, -/**/ - 2867, -/**/ - 2866, -/**/ - 2865, -/**/ - 2864, -/**/ - 2863, -/**/ - 2862, -/**/ - 2861, -/**/ - 2860, -/**/ - 2859, -/**/ - 2858, -/**/ - 2857, -/**/ - 2856, -/**/ - 2855, -/**/ - 2854, -/**/ - 2853, -/**/ - 2852, -/**/ - 2851, -/**/ - 2850, -/**/ - 2849, -/**/ - 2848, -/**/ - 2847, -/**/ - 2846, -/**/ - 2845, -/**/ - 2844, -/**/ - 2843, -/**/ - 2842, -/**/ - 2841, -/**/ - 2840, -/**/ - 2839, -/**/ - 2838, -/**/ - 2837, -/**/ - 2836, -/**/ - 2835, -/**/ - 2834, -/**/ - 2833, -/**/ - 2832, -/**/ - 2831, -/**/ - 2830, -/**/ - 2829, -/**/ - 2828, -/**/ - 2827, -/**/ - 2826, -/**/ - 2825, -/**/ - 2824, -/**/ - 2823, -/**/ - 2822, -/**/ - 2821, -/**/ - 2820, -/**/ - 2819, -/**/ - 2818, -/**/ - 2817, -/**/ - 2816, -/**/ - 2815, -/**/ - 2814, -/**/ - 2813, -/**/ - 2812, -/**/ - 2811, -/**/ - 2810, -/**/ - 2809, -/**/ - 2808, -/**/ - 2807, -/**/ - 2806, -/**/ - 2805, -/**/ - 2804, -/**/ - 2803, -/**/ - 2802, -/**/ - 2801, -/**/ - 2800, -/**/ - 2799, -/**/ - 2798, -/**/ - 2797, -/**/ - 2796, -/**/ - 2795, -/**/ - 2794, -/**/ - 2793, -/**/ - 2792, -/**/ - 2791, -/**/ - 2790, -/**/ - 2789, -/**/ - 2788, -/**/ - 2787, -/**/ - 2786, -/**/ - 2785, -/**/ - 2784, -/**/ - 2783, -/**/ - 2782, -/**/ - 2781, -/**/ - 2780, -/**/ - 2779, -/**/ - 2778, -/**/ - 2777, -/**/ - 2776, -/**/ - 2775, -/**/ - 2774, -/**/ - 2773, -/**/ - 2772, -/**/ - 2771, -/**/ - 2770, -/**/ - 2769, -/**/ - 2768, -/**/ - 2767, -/**/ - 2766, -/**/ - 2765, -/**/ - 2764, -/**/ - 2763, -/**/ - 2762, -/**/ - 2761, -/**/ - 2760, -/**/ - 2759, -/**/ - 2758, -/**/ - 2757, -/**/ - 2756, -/**/ - 2755, -/**/ - 2754, -/**/ - 2753, -/**/ - 2752, -/**/ - 2751, -/**/ - 2750, -/**/ - 2749, -/**/ - 2748, -/**/ - 2747, -/**/ - 2746, -/**/ - 2745, -/**/ - 2744, -/**/ - 2743, -/**/ - 2742, -/**/ - 2741, -/**/ - 2740, -/**/ - 2739, -/**/ - 2738, -/**/ - 2737, -/**/ - 2736, -/**/ - 2735, -/**/ - 2734, -/**/ - 2733, -/**/ - 2732, -/**/ - 2731, -/**/ - 2730, -/**/ - 2729, -/**/ - 2728, -/**/ - 2727, -/**/ - 2726, -/**/ - 2725, -/**/ - 2724, -/**/ - 2723, -/**/ - 2722, -/**/ - 2721, -/**/ - 2720, -/**/ - 2719, -/**/ - 2718, -/**/ - 2717, -/**/ - 2716, -/**/ - 2715, -/**/ - 2714, -/**/ - 2713, -/**/ - 2712, -/**/ - 2711, -/**/ - 2710, -/**/ - 2709, -/**/ - 2708, -/**/ - 2707, -/**/ - 2706, -/**/ - 2705, -/**/ - 2704, -/**/ - 2703, -/**/ - 2702, -/**/ - 2701, -/**/ - 2700, -/**/ - 2699, -/**/ - 2698, -/**/ - 2697, -/**/ - 2696, -/**/ - 2695, -/**/ - 2694, -/**/ - 2693, -/**/ - 2692, -/**/ - 2691, -/**/ - 2690, -/**/ - 2689, -/**/ - 2688, -/**/ - 2687, -/**/ - 2686, -/**/ - 2685, -/**/ - 2684, -/**/ - 2683, -/**/ - 2682, -/**/ - 2681, -/**/ - 2680, -/**/ - 2679, -/**/ - 2678, -/**/ - 2677, -/**/ - 2676, -/**/ - 2675, -/**/ - 2674, -/**/ - 2673, -/**/ - 2672, -/**/ - 2671, -/**/ - 2670, -/**/ - 2669, -/**/ - 2668, -/**/ - 2667, -/**/ - 2666, -/**/ - 2665, -/**/ - 2664, -/**/ - 2663, -/**/ - 2662, -/**/ - 2661, -/**/ - 2660, -/**/ - 2659, -/**/ - 2658, -/**/ - 2657, -/**/ - 2656, -/**/ - 2655, -/**/ - 2654, -/**/ - 2653, -/**/ - 2652, -/**/ - 2651, -/**/ - 2650, -/**/ - 2649, -/**/ - 2648, -/**/ - 2647, -/**/ - 2646, -/**/ - 2645, -/**/ - 2644, -/**/ - 2643, -/**/ - 2642, -/**/ - 2641, -/**/ - 2640, -/**/ - 2639, -/**/ - 2638, -/**/ - 2637, -/**/ - 2636, -/**/ - 2635, -/**/ - 2634, -/**/ - 2633, -/**/ - 2632, -/**/ - 2631, -/**/ - 2630, -/**/ - 2629, -/**/ - 2628, -/**/ - 2627, -/**/ - 2626, -/**/ - 2625, -/**/ - 2624, -/**/ - 2623, -/**/ - 2622, -/**/ - 2621, -/**/ - 2620, -/**/ - 2619, -/**/ - 2618, -/**/ - 2617, -/**/ - 2616, -/**/ - 2615, -/**/ - 2614, -/**/ - 2613, -/**/ - 2612, -/**/ - 2611, -/**/ - 2610, -/**/ - 2609, -/**/ - 2608, -/**/ - 2607, -/**/ - 2606, -/**/ - 2605, -/**/ - 2604, -/**/ - 2603, -/**/ - 2602, -/**/ - 2601, -/**/ - 2600, -/**/ - 2599, -/**/ - 2598, -/**/ - 2597, -/**/ - 2596, -/**/ - 2595, -/**/ - 2594, -/**/ - 2593, -/**/ - 2592, -/**/ - 2591, -/**/ - 2590, -/**/ - 2589, -/**/ - 2588, -/**/ - 2587, -/**/ - 2586, -/**/ - 2585, -/**/ - 2584, -/**/ - 2583, -/**/ - 2582, -/**/ - 2581, -/**/ - 2580, -/**/ - 2579, -/**/ - 2578, -/**/ - 2577, -/**/ - 2576, -/**/ - 2575, -/**/ - 2574, -/**/ - 2573, -/**/ - 2572, -/**/ - 2571, -/**/ - 2570, -/**/ - 2569, -/**/ - 2568, -/**/ - 2567, -/**/ - 2566, -/**/ - 2565, -/**/ - 2564, -/**/ - 2563, -/**/ - 2562, -/**/ - 2561, -/**/ - 2560, -/**/ - 2559, -/**/ - 2558, -/**/ - 2557, -/**/ - 2556, -/**/ - 2555, -/**/ - 2554, -/**/ - 2553, -/**/ - 2552, -/**/ - 2551, -/**/ - 2550, -/**/ - 2549, -/**/ - 2548, -/**/ - 2547, -/**/ - 2546, -/**/ - 2545, -/**/ - 2544, -/**/ - 2543, -/**/ - 2542, -/**/ - 2541, -/**/ - 2540, -/**/ - 2539, -/**/ - 2538, -/**/ - 2537, -/**/ - 2536, -/**/ - 2535, -/**/ - 2534, -/**/ - 2533, -/**/ - 2532, -/**/ - 2531, -/**/ - 2530, -/**/ - 2529, -/**/ - 2528, -/**/ - 2527, -/**/ - 2526, -/**/ - 2525, -/**/ - 2524, -/**/ - 2523, -/**/ - 2522, -/**/ - 2521, -/**/ - 2520, -/**/ - 2519, -/**/ - 2518, -/**/ - 2517, -/**/ - 2516, -/**/ - 2515, -/**/ - 2514, -/**/ - 2513, -/**/ - 2512, -/**/ - 2511, -/**/ - 2510, -/**/ - 2509, -/**/ - 2508, -/**/ - 2507, -/**/ - 2506, -/**/ - 2505, -/**/ - 2504, -/**/ - 2503, -/**/ - 2502, -/**/ - 2501, -/**/ - 2500, -/**/ - 2499, -/**/ - 2498, -/**/ - 2497, -/**/ - 2496, -/**/ - 2495, -/**/ - 2494, -/**/ - 2493, -/**/ - 2492, -/**/ - 2491, -/**/ - 2490, -/**/ - 2489, -/**/ - 2488, -/**/ - 2487, -/**/ - 2486, -/**/ - 2485, -/**/ - 2484, -/**/ - 2483, -/**/ - 2482, -/**/ - 2481, -/**/ - 2480, -/**/ - 2479, -/**/ - 2478, -/**/ - 2477, -/**/ - 2476, -/**/ - 2475, -/**/ - 2474, -/**/ - 2473, -/**/ - 2472, -/**/ - 2471, -/**/ - 2470, -/**/ - 2469, -/**/ - 2468, -/**/ - 2467, -/**/ - 2466, -/**/ - 2465, -/**/ - 2464, -/**/ - 2463, -/**/ - 2462, -/**/ - 2461, -/**/ - 2460, -/**/ - 2459, -/**/ - 2458, -/**/ - 2457, -/**/ - 2456, -/**/ - 2455, -/**/ - 2454, -/**/ - 2453, -/**/ - 2452, -/**/ - 2451, -/**/ - 2450, -/**/ - 2449, -/**/ - 2448, -/**/ - 2447, -/**/ - 2446, -/**/ - 2445, -/**/ - 2444, -/**/ - 2443, -/**/ - 2442, -/**/ - 2441, -/**/ - 2440, -/**/ - 2439, -/**/ - 2438, -/**/ - 2437, -/**/ - 2436, -/**/ - 2435, -/**/ - 2434, -/**/ - 2433, -/**/ - 2432, -/**/ - 2431, -/**/ - 2430, -/**/ - 2429, -/**/ - 2428, -/**/ - 2427, -/**/ - 2426, -/**/ - 2425, -/**/ - 2424, -/**/ - 2423, -/**/ - 2422, -/**/ - 2421, -/**/ - 2420, -/**/ - 2419, -/**/ - 2418, -/**/ - 2417, -/**/ - 2416, -/**/ - 2415, -/**/ - 2414, -/**/ - 2413, -/**/ - 2412, -/**/ - 2411, -/**/ - 2410, -/**/ - 2409, -/**/ - 2408, -/**/ - 2407, -/**/ - 2406, -/**/ - 2405, -/**/ - 2404, -/**/ - 2403, -/**/ - 2402, -/**/ - 2401, -/**/ - 2400, -/**/ - 2399, -/**/ - 2398, -/**/ - 2397, -/**/ - 2396, -/**/ - 2395, -/**/ - 2394, -/**/ - 2393, -/**/ - 2392, -/**/ - 2391, -/**/ - 2390, -/**/ - 2389, -/**/ - 2388, -/**/ - 2387, -/**/ - 2386, -/**/ - 2385, -/**/ - 2384, -/**/ - 2383, -/**/ - 2382, -/**/ - 2381, -/**/ - 2380, -/**/ - 2379, -/**/ - 2378, -/**/ - 2377, -/**/ - 2376, -/**/ - 2375, -/**/ - 2374, -/**/ - 2373, -/**/ - 2372, -/**/ - 2371, -/**/ - 2370, -/**/ - 2369, -/**/ - 2368, -/**/ - 2367, -/**/ - 2366, -/**/ - 2365, -/**/ - 2364, -/**/ - 2363, -/**/ - 2362, -/**/ - 2361, -/**/ - 2360, -/**/ - 2359, -/**/ - 2358, -/**/ - 2357, -/**/ - 2356, -/**/ - 2355, -/**/ - 2354, -/**/ - 2353, -/**/ - 2352, -/**/ - 2351, -/**/ - 2350, -/**/ - 2349, -/**/ - 2348, -/**/ - 2347, -/**/ - 2346, -/**/ - 2345, -/**/ - 2344, -/**/ - 2343, -/**/ - 2342, -/**/ - 2341, -/**/ - 2340, -/**/ - 2339, -/**/ - 2338, -/**/ - 2337, -/**/ - 2336, -/**/ - 2335, -/**/ - 2334, -/**/ - 2333, -/**/ - 2332, -/**/ - 2331, -/**/ - 2330, -/**/ - 2329, -/**/ - 2328, -/**/ - 2327, -/**/ - 2326, -/**/ - 2325, -/**/ - 2324, -/**/ - 2323, -/**/ - 2322, -/**/ - 2321, -/**/ - 2320, -/**/ - 2319, -/**/ - 2318, -/**/ - 2317, -/**/ - 2316, -/**/ - 2315, -/**/ - 2314, -/**/ - 2313, -/**/ - 2312, -/**/ - 2311, -/**/ - 2310, -/**/ - 2309, -/**/ - 2308, -/**/ - 2307, -/**/ - 2306, -/**/ - 2305, -/**/ - 2304, -/**/ - 2303, -/**/ - 2302, -/**/ - 2301, -/**/ - 2300, -/**/ - 2299, -/**/ - 2298, -/**/ - 2297, -/**/ - 2296, -/**/ - 2295, -/**/ - 2294, -/**/ - 2293, -/**/ - 2292, -/**/ - 2291, -/**/ - 2290, -/**/ - 2289, -/**/ - 2288, -/**/ - 2287, -/**/ - 2286, -/**/ - 2285, -/**/ - 2284, -/**/ - 2283, -/**/ - 2282, -/**/ - 2281, -/**/ - 2280, -/**/ - 2279, -/**/ - 2278, -/**/ - 2277, -/**/ - 2276, -/**/ - 2275, -/**/ - 2274, -/**/ - 2273, -/**/ - 2272, -/**/ - 2271, -/**/ - 2270, -/**/ - 2269, -/**/ - 2268, -/**/ - 2267, -/**/ - 2266, -/**/ - 2265, -/**/ - 2264, -/**/ - 2263, -/**/ - 2262, -/**/ - 2261, -/**/ - 2260, -/**/ - 2259, -/**/ - 2258, -/**/ - 2257, -/**/ - 2256, -/**/ - 2255, -/**/ - 2254, -/**/ - 2253, -/**/ - 2252, -/**/ - 2251, -/**/ - 2250, -/**/ - 2249, -/**/ - 2248, -/**/ - 2247, -/**/ - 2246, -/**/ - 2245, -/**/ - 2244, -/**/ - 2243, -/**/ - 2242, -/**/ - 2241, -/**/ - 2240, -/**/ - 2239, -/**/ - 2238, -/**/ - 2237, -/**/ - 2236, -/**/ - 2235, -/**/ - 2234, -/**/ - 2233, -/**/ - 2232, -/**/ - 2231, -/**/ - 2230, -/**/ - 2229, -/**/ - 2228, -/**/ - 2227, -/**/ - 2226, -/**/ - 2225, -/**/ - 2224, -/**/ - 2223, -/**/ - 2222, -/**/ - 2221, -/**/ - 2220, -/**/ - 2219, -/**/ - 2218, -/**/ - 2217, -/**/ - 2216, -/**/ - 2215, -/**/ - 2214, -/**/ - 2213, -/**/ - 2212, -/**/ - 2211, -/**/ - 2210, -/**/ - 2209, -/**/ - 2208, -/**/ - 2207, -/**/ - 2206, -/**/ - 2205, -/**/ - 2204, -/**/ - 2203, -/**/ - 2202, -/**/ - 2201, -/**/ - 2200, -/**/ - 2199, -/**/ - 2198, -/**/ - 2197, -/**/ - 2196, -/**/ - 2195, -/**/ - 2194, -/**/ - 2193, -/**/ - 2192, -/**/ - 2191, -/**/ - 2190, -/**/ - 2189, -/**/ - 2188, -/**/ - 2187, -/**/ - 2186, -/**/ - 2185, -/**/ - 2184, -/**/ - 2183, -/**/ - 2182, -/**/ - 2181, -/**/ - 2180, -/**/ - 2179, -/**/ - 2178, -/**/ - 2177, -/**/ - 2176, -/**/ - 2175, -/**/ - 2174, -/**/ - 2173, -/**/ - 2172, -/**/ - 2171, -/**/ - 2170, -/**/ - 2169, -/**/ - 2168, -/**/ - 2167, -/**/ - 2166, -/**/ - 2165, -/**/ - 2164, -/**/ - 2163, -/**/ - 2162, -/**/ - 2161, -/**/ - 2160, -/**/ - 2159, -/**/ - 2158, -/**/ - 2157, -/**/ - 2156, -/**/ - 2155, -/**/ - 2154, -/**/ - 2153, -/**/ - 2152, -/**/ - 2151, -/**/ - 2150, -/**/ - 2149, -/**/ - 2148, -/**/ - 2147, -/**/ - 2146, -/**/ - 2145, -/**/ - 2144, -/**/ - 2143, -/**/ - 2142, -/**/ - 2141, -/**/ - 2140, -/**/ - 2139, -/**/ - 2138, -/**/ - 2137, -/**/ - 2136, -/**/ - 2135, -/**/ - 2134, -/**/ - 2133, -/**/ - 2132, -/**/ - 2131, -/**/ - 2130, -/**/ - 2129, -/**/ - 2128, -/**/ - 2127, -/**/ - 2126, -/**/ - 2125, -/**/ - 2124, -/**/ - 2123, -/**/ - 2122, -/**/ - 2121, -/**/ - 2120, -/**/ - 2119, -/**/ - 2118, -/**/ - 2117, -/**/ - 2116, -/**/ - 2115, -/**/ - 2114, -/**/ - 2113, -/**/ - 2112, -/**/ - 2111, -/**/ - 2110, -/**/ - 2109, -/**/ - 2108, -/**/ - 2107, -/**/ - 2106, -/**/ - 2105, -/**/ - 2104, -/**/ - 2103, -/**/ - 2102, -/**/ - 2101, -/**/ - 2100, -/**/ - 2099, -/**/ - 2098, -/**/ - 2097, -/**/ - 2096, -/**/ - 2095, -/**/ - 2094, -/**/ - 2093, -/**/ - 2092, -/**/ - 2091, -/**/ - 2090, -/**/ - 2089, -/**/ - 2088, -/**/ - 2087, -/**/ - 2086, -/**/ - 2085, -/**/ - 2084, -/**/ - 2083, -/**/ - 2082, -/**/ - 2081, -/**/ - 2080, -/**/ - 2079, -/**/ - 2078, -/**/ - 2077, -/**/ - 2076, -/**/ - 2075, -/**/ - 2074, -/**/ - 2073, -/**/ - 2072, -/**/ - 2071, -/**/ - 2070, -/**/ - 2069, -/**/ - 2068, -/**/ - 2067, -/**/ - 2066, -/**/ - 2065, -/**/ - 2064, -/**/ - 2063, -/**/ - 2062, -/**/ - 2061, -/**/ - 2060, -/**/ - 2059, -/**/ - 2058, -/**/ - 2057, -/**/ - 2056, -/**/ - 2055, -/**/ - 2054, -/**/ - 2053, -/**/ - 2052, -/**/ - 2051, -/**/ - 2050, -/**/ - 2049, -/**/ - 2048, -/**/ - 2047, -/**/ - 2046, -/**/ - 2045, -/**/ - 2044, -/**/ - 2043, -/**/ - 2042, -/**/ - 2041, -/**/ - 2040, -/**/ - 2039, -/**/ - 2038, -/**/ - 2037, -/**/ - 2036, -/**/ - 2035, -/**/ - 2034, -/**/ - 2033, -/**/ - 2032, -/**/ - 2031, -/**/ - 2030, -/**/ - 2029, -/**/ - 2028, -/**/ - 2027, -/**/ - 2026, -/**/ - 2025, -/**/ - 2024, -/**/ - 2023, -/**/ - 2022, -/**/ - 2021, -/**/ - 2020, -/**/ - 2019, -/**/ - 2018, -/**/ - 2017, -/**/ - 2016, -/**/ - 2015, -/**/ - 2014, -/**/ - 2013, -/**/ - 2012, -/**/ - 2011, -/**/ - 2010, -/**/ - 2009, -/**/ - 2008, -/**/ - 2007, -/**/ - 2006, -/**/ - 2005, -/**/ - 2004, -/**/ - 2003, -/**/ - 2002, -/**/ - 2001, -/**/ - 2000, -/**/ - 1999, -/**/ - 1998, -/**/ - 1997, -/**/ - 1996, -/**/ - 1995, -/**/ - 1994, -/**/ - 1993, -/**/ - 1992, -/**/ - 1991, -/**/ - 1990, -/**/ - 1989, -/**/ - 1988, -/**/ - 1987, -/**/ - 1986, -/**/ - 1985, -/**/ - 1984, -/**/ - 1983, -/**/ - 1982, -/**/ - 1981, -/**/ - 1980, -/**/ - 1979, -/**/ - 1978, -/**/ - 1977, -/**/ - 1976, -/**/ - 1975, -/**/ - 1974, -/**/ - 1973, -/**/ - 1972, -/**/ - 1971, -/**/ - 1970, -/**/ - 1969, -/**/ - 1968, -/**/ - 1967, -/**/ - 1966, -/**/ - 1965, -/**/ - 1964, -/**/ - 1963, -/**/ - 1962, -/**/ - 1961, -/**/ - 1960, -/**/ - 1959, -/**/ - 1958, -/**/ - 1957, -/**/ - 1956, -/**/ - 1955, -/**/ - 1954, -/**/ - 1953, -/**/ - 1952, -/**/ - 1951, -/**/ - 1950, -/**/ - 1949, -/**/ - 1948, -/**/ - 1947, -/**/ - 1946, -/**/ - 1945, -/**/ - 1944, -/**/ - 1943, -/**/ - 1942, -/**/ - 1941, -/**/ - 1940, -/**/ - 1939, -/**/ - 1938, -/**/ - 1937, -/**/ - 1936, -/**/ - 1935, -/**/ - 1934, -/**/ - 1933, -/**/ - 1932, -/**/ - 1931, -/**/ - 1930, -/**/ - 1929, -/**/ - 1928, -/**/ - 1927, -/**/ - 1926, -/**/ - 1925, -/**/ - 1924, -/**/ - 1923, -/**/ - 1922, -/**/ - 1921, -/**/ - 1920, -/**/ - 1919, -/**/ - 1918, -/**/ - 1917, -/**/ - 1916, -/**/ - 1915, -/**/ - 1914, -/**/ - 1913, -/**/ - 1912, -/**/ - 1911, -/**/ - 1910, -/**/ - 1909, -/**/ - 1908, -/**/ - 1907, -/**/ - 1906, -/**/ - 1905, -/**/ - 1904, -/**/ - 1903, -/**/ - 1902, -/**/ - 1901, -/**/ - 1900, -/**/ - 1899, -/**/ - 1898, -/**/ - 1897, -/**/ - 1896, -/**/ - 1895, -/**/ - 1894, -/**/ - 1893, -/**/ - 1892, -/**/ - 1891, -/**/ - 1890, -/**/ - 1889, -/**/ - 1888, -/**/ - 1887, -/**/ - 1886, -/**/ - 1885, -/**/ - 1884, -/**/ - 1883, -/**/ - 1882, -/**/ - 1881, -/**/ - 1880, -/**/ - 1879, -/**/ - 1878, -/**/ - 1877, -/**/ - 1876, -/**/ - 1875, -/**/ - 1874, -/**/ - 1873, -/**/ - 1872, -/**/ - 1871, -/**/ - 1870, -/**/ - 1869, -/**/ - 1868, -/**/ - 1867, -/**/ - 1866, -/**/ - 1865, -/**/ - 1864, -/**/ - 1863, -/**/ - 1862, -/**/ - 1861, -/**/ - 1860, -/**/ - 1859, -/**/ - 1858, -/**/ - 1857, -/**/ - 1856, -/**/ - 1855, -/**/ - 1854, -/**/ - 1853, -/**/ - 1852, -/**/ - 1851, -/**/ - 1850, -/**/ - 1849, -/**/ - 1848, -/**/ - 1847, -/**/ - 1846, -/**/ - 1845, -/**/ - 1844, -/**/ - 1843, -/**/ - 1842, -/**/ - 1841, -/**/ - 1840, -/**/ - 1839, -/**/ - 1838, -/**/ - 1837, -/**/ - 1836, -/**/ - 1835, -/**/ - 1834, -/**/ - 1833, -/**/ - 1832, -/**/ - 1831, -/**/ - 1830, -/**/ - 1829, -/**/ - 1828, -/**/ - 1827, -/**/ - 1826, -/**/ - 1825, -/**/ - 1824, -/**/ - 1823, -/**/ - 1822, -/**/ - 1821, -/**/ - 1820, -/**/ - 1819, -/**/ - 1818, -/**/ - 1817, -/**/ - 1816, -/**/ - 1815, -/**/ - 1814, -/**/ - 1813, -/**/ - 1812, -/**/ - 1811, -/**/ - 1810, -/**/ - 1809, -/**/ - 1808, -/**/ - 1807, -/**/ - 1806, -/**/ - 1805, -/**/ - 1804, -/**/ - 1803, -/**/ - 1802, -/**/ - 1801, -/**/ - 1800, -/**/ - 1799, -/**/ - 1798, -/**/ - 1797, -/**/ - 1796, -/**/ - 1795, -/**/ - 1794, -/**/ - 1793, -/**/ - 1792, -/**/ - 1791, -/**/ - 1790, -/**/ - 1789, -/**/ - 1788, -/**/ - 1787, -/**/ - 1786, -/**/ - 1785, -/**/ - 1784, -/**/ - 1783, -/**/ - 1782, -/**/ - 1781, -/**/ - 1780, -/**/ - 1779, -/**/ - 1778, -/**/ - 1777, -/**/ - 1776, -/**/ - 1775, -/**/ - 1774, -/**/ - 1773, -/**/ - 1772, -/**/ - 1771, -/**/ - 1770, -/**/ - 1769, -/**/ - 1768, -/**/ - 1767, -/**/ - 1766, -/**/ - 1765, -/**/ - 1764, -/**/ - 1763, -/**/ - 1762, -/**/ - 1761, -/**/ - 1760, -/**/ - 1759, -/**/ - 1758, -/**/ - 1757, -/**/ - 1756, -/**/ - 1755, -/**/ - 1754, -/**/ - 1753, -/**/ - 1752, -/**/ - 1751, -/**/ - 1750, -/**/ - 1749, -/**/ - 1748, -/**/ - 1747, -/**/ - 1746, -/**/ - 1745, -/**/ - 1744, -/**/ - 1743, -/**/ - 1742, -/**/ - 1741, -/**/ - 1740, -/**/ - 1739, -/**/ - 1738, -/**/ - 1737, -/**/ - 1736, -/**/ - 1735, -/**/ - 1734, -/**/ - 1733, -/**/ - 1732, -/**/ - 1731, -/**/ - 1730, -/**/ - 1729, -/**/ - 1728, -/**/ - 1727, -/**/ - 1726, -/**/ - 1725, -/**/ - 1724, -/**/ - 1723, -/**/ - 1722, -/**/ - 1721, -/**/ - 1720, -/**/ - 1719, -/**/ - 1718, -/**/ - 1717, -/**/ - 1716, -/**/ - 1715, -/**/ - 1714, -/**/ - 1713, -/**/ - 1712, -/**/ - 1711, -/**/ - 1710, -/**/ - 1709, -/**/ - 1708, -/**/ - 1707, -/**/ - 1706, -/**/ - 1705, -/**/ - 1704, -/**/ - 1703, -/**/ - 1702, -/**/ - 1701, -/**/ - 1700, -/**/ - 1699, -/**/ - 1698, -/**/ - 1697, -/**/ - 1696, -/**/ - 1695, -/**/ - 1694, -/**/ - 1693, -/**/ - 1692, -/**/ - 1691, -/**/ - 1690, -/**/ - 1689, -/**/ - 1688, -/**/ - 1687, -/**/ - 1686, -/**/ - 1685, -/**/ - 1684, -/**/ - 1683, -/**/ - 1682, -/**/ - 1681, -/**/ - 1680, -/**/ - 1679, -/**/ - 1678, -/**/ - 1677, -/**/ - 1676, -/**/ - 1675, -/**/ - 1674, -/**/ - 1673, -/**/ - 1672, -/**/ - 1671, -/**/ - 1670, -/**/ - 1669, -/**/ - 1668, -/**/ - 1667, -/**/ - 1666, -/**/ - 1665, -/**/ - 1664, -/**/ - 1663, -/**/ - 1662, -/**/ - 1661, -/**/ - 1660, -/**/ - 1659, -/**/ - 1658, -/**/ - 1657, -/**/ - 1656, -/**/ - 1655, -/**/ - 1654, -/**/ - 1653, -/**/ - 1652, -/**/ - 1651, -/**/ - 1650, -/**/ - 1649, -/**/ - 1648, -/**/ - 1647, -/**/ - 1646, -/**/ - 1645, -/**/ - 1644, -/**/ - 1643, -/**/ - 1642, -/**/ - 1641, -/**/ - 1640, -/**/ - 1639, -/**/ - 1638, -/**/ - 1637, -/**/ - 1636, -/**/ - 1635, -/**/ - 1634, -/**/ - 1633, -/**/ - 1632, -/**/ - 1631, -/**/ - 1630, -/**/ - 1629, -/**/ - 1628, -/**/ - 1627, -/**/ - 1626, -/**/ - 1625, -/**/ - 1624, -/**/ - 1623, -/**/ - 1622, -/**/ - 1621, -/**/ - 1620, -/**/ - 1619, -/**/ - 1618, -/**/ - 1617, -/**/ - 1616, -/**/ - 1615, -/**/ - 1614, -/**/ - 1613, -/**/ - 1612, -/**/ - 1611, -/**/ - 1610, -/**/ - 1609, -/**/ - 1608, -/**/ - 1607, -/**/ - 1606, -/**/ - 1605, -/**/ - 1604, -/**/ - 1603, -/**/ - 1602, -/**/ - 1601, -/**/ - 1600, -/**/ - 1599, -/**/ - 1598, -/**/ - 1597, -/**/ - 1596, -/**/ - 1595, -/**/ - 1594, -/**/ - 1593, -/**/ - 1592, -/**/ - 1591, -/**/ - 1590, -/**/ - 1589, -/**/ - 1588, -/**/ - 1587, -/**/ - 1586, -/**/ - 1585, -/**/ - 1584, -/**/ - 1583, -/**/ - 1582, -/**/ - 1581, -/**/ - 1580, -/**/ - 1579, -/**/ - 1578, -/**/ - 1577, -/**/ - 1576, -/**/ - 1575, -/**/ - 1574, -/**/ - 1573, -/**/ - 1572, -/**/ - 1571, -/**/ - 1570, -/**/ - 1569, -/**/ - 1568, -/**/ - 1567, -/**/ - 1566, -/**/ - 1565, -/**/ - 1564, -/**/ - 1563, -/**/ - 1562, -/**/ - 1561, -/**/ - 1560, -/**/ - 1559, -/**/ - 1558, -/**/ - 1557, -/**/ - 1556, -/**/ - 1555, -/**/ - 1554, -/**/ - 1553, -/**/ - 1552, -/**/ - 1551, -/**/ - 1550, -/**/ - 1549, -/**/ - 1548, -/**/ - 1547, -/**/ - 1546, -/**/ - 1545, -/**/ - 1544, -/**/ - 1543, -/**/ - 1542, -/**/ - 1541, -/**/ - 1540, -/**/ - 1539, -/**/ - 1538, -/**/ - 1537, -/**/ - 1536, -/**/ - 1535, -/**/ - 1534, -/**/ - 1533, -/**/ - 1532, -/**/ - 1531, -/**/ - 1530, -/**/ - 1529, -/**/ - 1528, -/**/ - 1527, -/**/ - 1526, -/**/ - 1525, -/**/ - 1524, -/**/ - 1523, -/**/ - 1522, -/**/ - 1521, -/**/ - 1520, -/**/ - 1519, -/**/ - 1518, -/**/ - 1517, -/**/ - 1516, -/**/ - 1515, -/**/ - 1514, -/**/ - 1513, -/**/ - 1512, -/**/ - 1511, -/**/ - 1510, -/**/ - 1509, -/**/ - 1508, -/**/ - 1507, -/**/ - 1506, -/**/ - 1505, -/**/ - 1504, -/**/ - 1503, -/**/ - 1502, -/**/ - 1501, -/**/ - 1500, -/**/ - 1499, -/**/ - 1498, -/**/ - 1497, -/**/ - 1496, -/**/ - 1495, -/**/ - 1494, -/**/ - 1493, -/**/ - 1492, -/**/ - 1491, -/**/ - 1490, -/**/ - 1489, -/**/ - 1488, -/**/ - 1487, -/**/ - 1486, -/**/ - 1485, -/**/ - 1484, -/**/ - 1483, -/**/ - 1482, -/**/ - 1481, -/**/ - 1480, -/**/ - 1479, -/**/ - 1478, -/**/ - 1477, -/**/ - 1476, -/**/ - 1475, -/**/ - 1474, -/**/ - 1473, -/**/ - 1472, -/**/ - 1471, -/**/ - 1470, -/**/ - 1469, -/**/ - 1468, -/**/ - 1467, -/**/ - 1466, -/**/ - 1465, -/**/ - 1464, -/**/ - 1463, -/**/ - 1462, -/**/ - 1461, -/**/ - 1460, -/**/ - 1459, -/**/ - 1458, -/**/ - 1457, -/**/ - 1456, -/**/ - 1455, -/**/ - 1454, -/**/ - 1453, -/**/ - 1452, -/**/ - 1451, -/**/ - 1450, -/**/ - 1449, -/**/ - 1448, -/**/ - 1447, -/**/ - 1446, -/**/ - 1445, -/**/ - 1444, -/**/ - 1443, -/**/ - 1442, -/**/ - 1441, -/**/ - 1440, -/**/ - 1439, -/**/ - 1438, -/**/ - 1437, -/**/ - 1436, -/**/ - 1435, -/**/ - 1434, -/**/ - 1433, -/**/ - 1432, -/**/ - 1431, -/**/ - 1430, -/**/ - 1429, -/**/ - 1428, -/**/ - 1427, -/**/ - 1426, -/**/ - 1425, -/**/ - 1424, -/**/ - 1423, -/**/ - 1422, -/**/ - 1421, -/**/ - 1420, -/**/ - 1419, -/**/ - 1418, -/**/ - 1417, -/**/ - 1416, -/**/ - 1415, -/**/ - 1414, -/**/ - 1413, -/**/ - 1412, -/**/ - 1411, -/**/ - 1410, -/**/ - 1409, -/**/ - 1408, -/**/ - 1407, -/**/ - 1406, -/**/ - 1405, -/**/ - 1404, -/**/ - 1403, -/**/ - 1402, -/**/ - 1401, -/**/ - 1400, -/**/ - 1399, -/**/ - 1398, -/**/ - 1397, -/**/ - 1396, -/**/ - 1395, -/**/ - 1394, -/**/ - 1393, -/**/ - 1392, -/**/ - 1391, -/**/ - 1390, -/**/ - 1389, -/**/ - 1388, -/**/ - 1387, -/**/ - 1386, -/**/ - 1385, -/**/ - 1384, -/**/ - 1383, -/**/ - 1382, -/**/ - 1381, -/**/ - 1380, -/**/ - 1379, -/**/ - 1378, -/**/ - 1377, -/**/ - 1376, -/**/ - 1375, -/**/ - 1374, -/**/ - 1373, -/**/ - 1372, -/**/ - 1371, -/**/ - 1370, -/**/ - 1369, -/**/ - 1368, -/**/ - 1367, -/**/ - 1366, -/**/ - 1365, -/**/ - 1364, -/**/ - 1363, -/**/ - 1362, -/**/ - 1361, -/**/ - 1360, -/**/ - 1359, -/**/ - 1358, -/**/ - 1357, -/**/ - 1356, -/**/ - 1355, -/**/ - 1354, -/**/ - 1353, -/**/ - 1352, -/**/ - 1351, -/**/ - 1350, -/**/ - 1349, -/**/ - 1348, -/**/ - 1347, -/**/ - 1346, -/**/ - 1345, -/**/ - 1344, -/**/ - 1343, -/**/ - 1342, -/**/ - 1341, -/**/ - 1340, -/**/ - 1339, -/**/ - 1338, -/**/ - 1337, -/**/ - 1336, -/**/ - 1335, -/**/ - 1334, -/**/ - 1333, -/**/ - 1332, -/**/ - 1331, -/**/ - 1330, -/**/ - 1329, -/**/ - 1328, -/**/ - 1327, -/**/ - 1326, -/**/ - 1325, -/**/ - 1324, -/**/ - 1323, -/**/ - 1322, -/**/ - 1321, -/**/ - 1320, -/**/ - 1319, -/**/ - 1318, -/**/ - 1317, -/**/ - 1316, -/**/ - 1315, -/**/ - 1314, -/**/ - 1313, -/**/ - 1312, -/**/ - 1311, -/**/ - 1310, -/**/ - 1309, -/**/ - 1308, -/**/ - 1307, -/**/ - 1306, -/**/ - 1305, -/**/ - 1304, -/**/ - 1303, -/**/ - 1302, -/**/ - 1301, -/**/ - 1300, -/**/ - 1299, -/**/ - 1298, -/**/ - 1297, -/**/ - 1296, -/**/ - 1295, -/**/ - 1294, -/**/ - 1293, -/**/ - 1292, -/**/ - 1291, -/**/ - 1290, -/**/ - 1289, -/**/ - 1288, -/**/ - 1287, -/**/ - 1286, -/**/ - 1285, -/**/ - 1284, -/**/ - 1283, -/**/ - 1282, -/**/ - 1281, -/**/ - 1280, -/**/ - 1279, -/**/ - 1278, -/**/ - 1277, -/**/ - 1276, -/**/ - 1275, -/**/ - 1274, -/**/ - 1273, -/**/ - 1272, -/**/ - 1271, -/**/ - 1270, -/**/ - 1269, -/**/ - 1268, -/**/ - 1267, -/**/ - 1266, -/**/ - 1265, -/**/ - 1264, -/**/ - 1263, -/**/ - 1262, -/**/ - 1261, -/**/ - 1260, -/**/ - 1259, -/**/ - 1258, -/**/ - 1257, -/**/ - 1256, -/**/ - 1255, -/**/ - 1254, -/**/ - 1253, -/**/ - 1252, -/**/ - 1251, -/**/ - 1250, -/**/ - 1249, -/**/ - 1248, -/**/ - 1247, -/**/ - 1246, -/**/ - 1245, -/**/ - 1244, -/**/ - 1243, -/**/ - 1242, -/**/ - 1241, -/**/ - 1240, -/**/ - 1239, -/**/ - 1238, -/**/ - 1237, -/**/ - 1236, -/**/ - 1235, -/**/ - 1234, -/**/ - 1233, -/**/ - 1232, -/**/ - 1231, -/**/ - 1230, -/**/ - 1229, -/**/ - 1228, -/**/ - 1227, -/**/ - 1226, -/**/ - 1225, -/**/ - 1224, -/**/ - 1223, -/**/ - 1222, -/**/ - 1221, -/**/ - 1220, -/**/ - 1219, -/**/ - 1218, -/**/ - 1217, -/**/ - 1216, -/**/ - 1215, -/**/ - 1214, -/**/ - 1213, -/**/ - 1212, -/**/ - 1211, -/**/ - 1210, -/**/ - 1209, -/**/ - 1208, -/**/ - 1207, -/**/ - 1206, -/**/ - 1205, -/**/ - 1204, -/**/ - 1203, -/**/ - 1202, -/**/ - 1201, -/**/ - 1200, -/**/ - 1199, -/**/ - 1198, -/**/ - 1197, -/**/ - 1196, -/**/ - 1195, -/**/ - 1194, -/**/ - 1193, -/**/ - 1192, -/**/ - 1191, -/**/ - 1190, -/**/ - 1189, -/**/ - 1188, -/**/ - 1187, -/**/ - 1186, -/**/ - 1185, -/**/ - 1184, -/**/ - 1183, -/**/ - 1182, -/**/ - 1181, -/**/ - 1180, -/**/ - 1179, -/**/ - 1178, -/**/ - 1177, -/**/ - 1176, -/**/ - 1175, -/**/ - 1174, -/**/ - 1173, -/**/ - 1172, -/**/ - 1171, -/**/ - 1170, -/**/ - 1169, -/**/ - 1168, -/**/ - 1167, -/**/ - 1166, -/**/ - 1165, -/**/ - 1164, -/**/ - 1163, -/**/ - 1162, -/**/ - 1161, -/**/ - 1160, -/**/ - 1159, -/**/ - 1158, -/**/ - 1157, -/**/ - 1156, -/**/ - 1155, -/**/ - 1154, -/**/ - 1153, -/**/ - 1152, -/**/ - 1151, -/**/ - 1150, -/**/ - 1149, -/**/ - 1148, -/**/ - 1147, -/**/ - 1146, -/**/ - 1145, -/**/ - 1144, -/**/ - 1143, -/**/ - 1142, -/**/ - 1141, -/**/ - 1140, -/**/ - 1139, -/**/ - 1138, -/**/ - 1137, -/**/ - 1136, -/**/ - 1135, -/**/ - 1134, -/**/ - 1133, -/**/ - 1132, -/**/ - 1131, -/**/ - 1130, -/**/ - 1129, -/**/ - 1128, -/**/ - 1127, -/**/ - 1126, -/**/ - 1125, -/**/ - 1124, -/**/ - 1123, -/**/ - 1122, -/**/ - 1121, -/**/ - 1120, -/**/ - 1119, -/**/ - 1118, -/**/ - 1117, -/**/ - 1116, -/**/ - 1115, -/**/ - 1114, -/**/ - 1113, -/**/ - 1112, -/**/ - 1111, -/**/ - 1110, -/**/ - 1109, -/**/ - 1108, -/**/ - 1107, -/**/ - 1106, -/**/ - 1105, -/**/ - 1104, -/**/ - 1103, -/**/ - 1102, -/**/ - 1101, -/**/ - 1100, -/**/ - 1099, -/**/ - 1098, -/**/ - 1097, -/**/ - 1096, -/**/ - 1095, -/**/ - 1094, -/**/ - 1093, -/**/ - 1092, -/**/ - 1091, -/**/ - 1090, -/**/ - 1089, -/**/ - 1088, -/**/ - 1087, -/**/ - 1086, -/**/ - 1085, -/**/ - 1084, -/**/ - 1083, -/**/ - 1082, -/**/ - 1081, -/**/ - 1080, -/**/ - 1079, -/**/ - 1078, -/**/ - 1077, -/**/ - 1076, -/**/ - 1075, -/**/ - 1074, -/**/ - 1073, -/**/ - 1072, -/**/ - 1071, -/**/ - 1070, -/**/ - 1069, -/**/ - 1068, -/**/ - 1067, -/**/ - 1066, -/**/ - 1065, -/**/ - 1064, -/**/ - 1063, -/**/ - 1062, -/**/ - 1061, -/**/ - 1060, -/**/ - 1059, -/**/ - 1058, -/**/ - 1057, -/**/ - 1056, -/**/ - 1055, -/**/ - 1054, -/**/ - 1053, -/**/ - 1052, -/**/ - 1051, -/**/ - 1050, -/**/ - 1049, -/**/ - 1048, -/**/ - 1047, -/**/ - 1046, -/**/ - 1045, -/**/ - 1044, -/**/ - 1043, -/**/ - 1042, -/**/ - 1041, -/**/ - 1040, -/**/ - 1039, -/**/ - 1038, -/**/ - 1037, -/**/ - 1036, -/**/ - 1035, -/**/ - 1034, -/**/ - 1033, -/**/ - 1032, -/**/ - 1031, -/**/ - 1030, -/**/ - 1029, -/**/ - 1028, -/**/ - 1027, -/**/ - 1026, -/**/ - 1025, -/**/ - 1024, -/**/ - 1023, -/**/ - 1022, -/**/ - 1021, -/**/ - 1020, -/**/ - 1019, -/**/ - 1018, -/**/ - 1017, -/**/ - 1016, -/**/ - 1015, -/**/ - 1014, -/**/ - 1013, -/**/ - 1012, -/**/ - 1011, -/**/ - 1010, -/**/ - 1009, -/**/ - 1008, -/**/ - 1007, -/**/ - 1006, -/**/ - 1005, -/**/ - 1004, -/**/ - 1003, -/**/ - 1002, -/**/ - 1001, -/**/ - 1000, -/**/ - 999, -/**/ - 998, -/**/ - 997, -/**/ - 996, -/**/ - 995, -/**/ - 994, -/**/ - 993, -/**/ - 992, -/**/ - 991, -/**/ - 990, -/**/ - 989, -/**/ - 988, -/**/ - 987, -/**/ - 986, -/**/ - 985, -/**/ - 984, -/**/ - 983, -/**/ - 982, -/**/ - 981, -/**/ - 980, -/**/ - 979, -/**/ - 978, -/**/ - 977, -/**/ - 976, -/**/ - 975, -/**/ - 974, -/**/ - 973, -/**/ - 972, -/**/ - 971, -/**/ - 970, -/**/ - 969, -/**/ - 968, -/**/ - 967, -/**/ - 966, -/**/ - 965, -/**/ - 964, -/**/ - 963, -/**/ - 962, -/**/ - 961, -/**/ - 960, -/**/ - 959, -/**/ - 958, -/**/ - 957, -/**/ - 956, -/**/ - 955, -/**/ - 954, -/**/ - 953, -/**/ - 952, -/**/ - 951, -/**/ - 950, -/**/ - 949, -/**/ - 948, -/**/ - 947, -/**/ - 946, -/**/ - 945, -/**/ - 944, -/**/ - 943, -/**/ - 942, -/**/ - 941, -/**/ - 940, -/**/ - 939, -/**/ - 938, -/**/ - 937, -/**/ - 936, -/**/ - 935, -/**/ - 934, -/**/ - 933, -/**/ - 932, -/**/ - 931, -/**/ - 930, -/**/ - 929, -/**/ - 928, -/**/ - 927, -/**/ - 926, -/**/ - 925, -/**/ - 924, -/**/ - 923, -/**/ - 922, -/**/ - 921, -/**/ - 920, -/**/ - 919, -/**/ - 918, -/**/ - 917, -/**/ - 916, -/**/ - 915, -/**/ - 914, -/**/ - 913, -/**/ - 912, -/**/ - 911, -/**/ - 910, -/**/ - 909, -/**/ - 908, -/**/ - 907, -/**/ - 906, -/**/ - 905, -/**/ - 904, -/**/ - 903, -/**/ - 902, -/**/ - 901, -/**/ - 900, -/**/ - 899, -/**/ - 898, -/**/ - 897, -/**/ - 896, -/**/ - 895, -/**/ - 894, -/**/ - 893, -/**/ - 892, -/**/ - 891, -/**/ - 890, -/**/ - 889, -/**/ - 888, -/**/ - 887, -/**/ - 886, -/**/ - 885, -/**/ - 884, -/**/ - 883, -/**/ - 882, -/**/ - 881, -/**/ - 880, -/**/ - 879, -/**/ - 878, -/**/ - 877, -/**/ - 876, -/**/ - 875, -/**/ - 874, -/**/ - 873, -/**/ - 872, -/**/ - 871, -/**/ - 870, -/**/ - 869, -/**/ - 868, -/**/ - 867, -/**/ - 866, -/**/ - 865, -/**/ - 864, -/**/ - 863, -/**/ - 862, -/**/ - 861, -/**/ - 860, -/**/ - 859, -/**/ - 858, -/**/ - 857, -/**/ - 856, -/**/ - 855, -/**/ - 854, -/**/ - 853, -/**/ - 852, -/**/ - 851, -/**/ - 850, -/**/ - 849, -/**/ - 848, -/**/ - 847, -/**/ - 846, -/**/ - 845, -/**/ - 844, -/**/ - 843, -/**/ - 842, -/**/ - 841, -/**/ - 840, -/**/ - 839, -/**/ - 838, -/**/ - 837, -/**/ - 836, -/**/ - 835, -/**/ - 834, -/**/ - 833, -/**/ - 832, -/**/ - 831, -/**/ - 830, -/**/ - 829, -/**/ - 828, -/**/ - 827, -/**/ - 826, -/**/ - 825, -/**/ - 824, -/**/ - 823, -/**/ - 822, -/**/ - 821, -/**/ - 820, -/**/ - 819, -/**/ - 818, -/**/ - 817, -/**/ - 816, -/**/ - 815, -/**/ - 814, -/**/ - 813, -/**/ - 812, -/**/ - 811, -/**/ - 810, -/**/ - 809, -/**/ - 808, -/**/ - 807, -/**/ - 806, -/**/ - 805, -/**/ - 804, -/**/ - 803, -/**/ - 802, -/**/ - 801, -/**/ - 800, -/**/ - 799, -/**/ - 798, -/**/ - 797, -/**/ - 796, -/**/ - 795, -/**/ - 794, -/**/ - 793, -/**/ - 792, -/**/ - 791, -/**/ - 790, -/**/ - 789, -/**/ - 788, -/**/ - 787, -/**/ - 786, -/**/ - 785, -/**/ - 784, -/**/ - 783, -/**/ - 782, -/**/ - 781, -/**/ - 780, -/**/ - 779, -/**/ - 778, -/**/ - 777, -/**/ - 776, -/**/ - 775, -/**/ - 774, -/**/ - 773, -/**/ - 772, -/**/ - 771, -/**/ - 770, -/**/ - 769, -/**/ - 768, -/**/ - 767, -/**/ - 766, -/**/ - 765, -/**/ - 764, -/**/ - 763, -/**/ - 762, -/**/ - 761, -/**/ - 760, -/**/ - 759, -/**/ - 758, -/**/ - 757, -/**/ - 756, -/**/ - 755, -/**/ - 754, -/**/ - 753, -/**/ - 752, -/**/ - 751, -/**/ - 750, -/**/ - 749, -/**/ - 748, -/**/ - 747, -/**/ - 746, -/**/ - 745, -/**/ - 744, -/**/ - 743, -/**/ - 742, -/**/ - 741, -/**/ - 740, -/**/ - 739, -/**/ - 738, -/**/ - 737, -/**/ - 736, -/**/ - 735, -/**/ - 734, -/**/ - 733, -/**/ - 732, -/**/ - 731, -/**/ - 730, -/**/ - 729, -/**/ - 728, -/**/ - 727, -/**/ - 726, -/**/ - 725, -/**/ - 724, -/**/ - 723, -/**/ - 722, -/**/ - 721, -/**/ - 720, -/**/ - 719, -/**/ - 718, -/**/ - 717, -/**/ - 716, -/**/ - 715, -/**/ - 714, -/**/ - 713, -/**/ - 712, -/**/ - 711, -/**/ - 710, -/**/ - 709, -/**/ - 708, -/**/ - 707, -/**/ - 706, -/**/ - 705, -/**/ - 704, -/**/ - 703, -/**/ - 702, -/**/ - 701, -/**/ - 700, -/**/ - 699, -/**/ - 698, -/**/ - 697, -/**/ - 696, -/**/ - 695, -/**/ - 694, -/**/ - 693, -/**/ - 692, -/**/ - 691, -/**/ - 690, -/**/ - 689, -/**/ - 688, -/**/ - 687, -/**/ - 686, -/**/ - 685, -/**/ - 684, -/**/ - 683, -/**/ - 682, -/**/ - 681, -/**/ - 680, -/**/ - 679, -/**/ - 678, -/**/ - 677, -/**/ - 676, -/**/ - 675, -/**/ - 674, -/**/ - 673, -/**/ - 672, -/**/ - 671, -/**/ - 670, -/**/ - 669, -/**/ - 668, -/**/ - 667, -/**/ - 666, -/**/ - 665, -/**/ - 664, -/**/ - 663, -/**/ - 662, -/**/ - 661, -/**/ - 660, -/**/ - 659, -/**/ - 658, -/**/ - 657, -/**/ - 656, -/**/ - 655, -/**/ - 654, -/**/ - 653, -/**/ - 652, -/**/ - 651, -/**/ - 650, -/**/ - 649, -/**/ - 648, -/**/ - 647, -/**/ - 646, -/**/ - 645, -/**/ - 644, -/**/ - 643, -/**/ - 642, -/**/ - 641, -/**/ - 640, -/**/ - 639, -/**/ - 638, -/**/ - 637, -/**/ - 636, -/**/ - 635, -/**/ - 634, -/**/ - 633, -/**/ - 632, -/**/ - 631, -/**/ - 630, -/**/ - 629, -/**/ - 628, -/**/ - 627, -/**/ - 626, -/**/ - 625, -/**/ - 624, -/**/ - 623, -/**/ - 622, -/**/ - 621, -/**/ - 620, -/**/ - 619, -/**/ - 618, -/**/ - 617, -/**/ - 616, -/**/ - 615, -/**/ - 614, -/**/ - 613, -/**/ - 612, -/**/ - 611, -/**/ - 610, -/**/ - 609, -/**/ - 608, -/**/ - 607, -/**/ - 606, -/**/ - 605, -/**/ - 604, -/**/ - 603, -/**/ - 602, -/**/ - 601, -/**/ - 600, -/**/ - 599, -/**/ - 598, -/**/ - 597, -/**/ - 596, -/**/ - 595, -/**/ - 594, -/**/ - 593, -/**/ - 592, -/**/ - 591, -/**/ - 590, -/**/ - 589, -/**/ - 588, -/**/ - 587, -/**/ - 586, -/**/ - 585, -/**/ - 584, -/**/ - 583, -/**/ - 582, -/**/ - 581, -/**/ - 580, -/**/ - 579, -/**/ - 578, -/**/ - 577, -/**/ - 576, -/**/ - 575, -/**/ - 574, -/**/ - 573, -/**/ - 572, -/**/ - 571, -/**/ - 570, -/**/ - 569, -/**/ - 568, -/**/ - 567, -/**/ - 566, -/**/ - 565, -/**/ - 564, -/**/ - 563, -/**/ - 562, -/**/ - 561, -/**/ - 560, -/**/ - 559, -/**/ - 558, -/**/ - 557, -/**/ - 556, -/**/ - 555, -/**/ - 554, -/**/ - 553, -/**/ - 552, -/**/ - 551, -/**/ - 550, -/**/ - 549, -/**/ - 548, -/**/ - 547, -/**/ - 546, -/**/ - 545, -/**/ - 544, -/**/ - 543, -/**/ - 542, -/**/ - 541, -/**/ - 540, -/**/ - 539, -/**/ - 538, -/**/ - 537, -/**/ - 536, -/**/ - 535, -/**/ - 534, -/**/ - 533, -/**/ - 532, -/**/ - 531, -/**/ - 530, -/**/ - 529, -/**/ - 528, -/**/ - 527, -/**/ - 526, -/**/ - 525, -/**/ - 524, -/**/ - 523, -/**/ - 522, -/**/ - 521, -/**/ - 520, -/**/ - 519, -/**/ - 518, -/**/ - 517, -/**/ - 516, -/**/ - 515, -/**/ - 514, -/**/ - 513, -/**/ - 512, -/**/ - 511, -/**/ - 510, -/**/ - 509, -/**/ - 508, -/**/ - 507, -/**/ - 506, -/**/ - 505, -/**/ - 504, -/**/ - 503, -/**/ - 502, -/**/ - 501, -/**/ - 500, -/**/ - 499, -/**/ - 498, -/**/ - 497, -/**/ - 496, -/**/ - 495, -/**/ - 494, -/**/ - 493, -/**/ - 492, -/**/ - 491, -/**/ - 490, -/**/ - 489, -/**/ - 488, -/**/ - 487, -/**/ - 486, -/**/ - 485, -/**/ - 484, -/**/ - 483, -/**/ - 482, -/**/ - 481, -/**/ - 480, -/**/ - 479, -/**/ - 478, -/**/ - 477, -/**/ - 476, -/**/ - 475, -/**/ - 474, -/**/ - 473, -/**/ - 472, -/**/ - 471, -/**/ - 470, -/**/ - 469, -/**/ - 468, -/**/ - 467, -/**/ - 466, -/**/ - 465, -/**/ - 464, -/**/ - 463, -/**/ - 462, -/**/ - 461, -/**/ - 460, -/**/ - 459, -/**/ - 458, -/**/ - 457, -/**/ - 456, -/**/ - 455, -/**/ - 454, -/**/ - 453, -/**/ - 452, -/**/ - 451, -/**/ - 450, -/**/ - 449, -/**/ - 448, -/**/ - 447, -/**/ - 446, -/**/ - 445, -/**/ - 444, -/**/ - 443, -/**/ - 442, -/**/ - 441, -/**/ - 440, -/**/ - 439, -/**/ - 438, -/**/ - 437, -/**/ - 436, -/**/ - 435, -/**/ - 434, -/**/ - 433, -/**/ - 432, -/**/ - 431, -/**/ - 430, -/**/ - 429, -/**/ - 428, -/**/ - 427, -/**/ - 426, -/**/ - 425, -/**/ - 424, -/**/ - 423, -/**/ - 422, -/**/ - 421, -/**/ - 420, -/**/ - 419, -/**/ - 418, -/**/ - 417, -/**/ - 416, -/**/ - 415, -/**/ - 414, -/**/ - 413, -/**/ - 412, -/**/ - 411, -/**/ - 410, -/**/ - 409, -/**/ - 408, -/**/ - 407, -/**/ - 406, -/**/ - 405, -/**/ - 404, -/**/ - 403, -/**/ - 402, -/**/ - 401, -/**/ - 400, -/**/ - 399, -/**/ - 398, -/**/ - 397, -/**/ - 396, -/**/ - 395, -/**/ - 394, -/**/ - 393, -/**/ - 392, -/**/ - 391, -/**/ - 390, -/**/ - 389, -/**/ - 388, -/**/ - 387, -/**/ - 386, -/**/ - 385, -/**/ - 384, -/**/ - 383, -/**/ - 382, -/**/ - 381, -/**/ - 380, -/**/ - 379, -/**/ - 378, -/**/ - 377, -/**/ - 376, -/**/ - 375, -/**/ - 374, -/**/ - 373, -/**/ - 372, -/**/ - 371, -/**/ - 370, -/**/ - 369, -/**/ - 368, -/**/ - 367, -/**/ - 366, -/**/ - 365, -/**/ - 364, -/**/ - 363, -/**/ - 362, -/**/ - 361, -/**/ - 360, -/**/ - 359, -/**/ - 358, -/**/ - 357, -/**/ - 356, -/**/ - 355, -/**/ - 354, -/**/ - 353, -/**/ - 352, -/**/ - 351, -/**/ - 350, -/**/ - 349, -/**/ - 348, -/**/ - 347, -/**/ - 346, -/**/ - 345, -/**/ - 344, -/**/ - 343, -/**/ - 342, -/**/ - 341, -/**/ - 340, -/**/ - 339, -/**/ - 338, -/**/ - 337, -/**/ - 336, -/**/ - 335, -/**/ - 334, -/**/ - 333, -/**/ - 332, -/**/ - 331, -/**/ - 330, -/**/ - 329, -/**/ - 328, -/**/ - 327, -/**/ - 326, -/**/ - 325, -/**/ - 324, -/**/ - 323, -/**/ - 322, -/**/ - 321, -/**/ - 320, -/**/ - 319, -/**/ - 318, -/**/ - 317, -/**/ - 316, -/**/ - 315, -/**/ - 314, -/**/ - 313, -/**/ - 312, -/**/ - 311, -/**/ - 310, -/**/ - 309, -/**/ - 308, -/**/ - 307, -/**/ - 306, -/**/ - 305, -/**/ - 304, -/**/ - 303, -/**/ - 302, -/**/ - 301, -/**/ - 300, -/**/ - 299, -/**/ - 298, -/**/ - 297, -/**/ - 296, -/**/ - 295, -/**/ - 294, -/**/ - 293, -/**/ - 292, -/**/ - 291, -/**/ - 290, -/**/ - 289, -/**/ - 288, -/**/ - 287, -/**/ - 286, -/**/ - 285, -/**/ - 284, -/**/ - 283, -/**/ - 282, -/**/ - 281, -/**/ - 280, -/**/ - 279, -/**/ - 278, -/**/ - 277, -/**/ - 276, -/**/ - 275, -/**/ - 274, -/**/ - 273, -/**/ - 272, -/**/ - 271, -/**/ - 270, -/**/ - 269, -/**/ - 268, -/**/ - 267, -/**/ - 266, -/**/ - 265, -/**/ - 264, -/**/ - 263, -/**/ - 262, -/**/ - 261, -/**/ - 260, -/**/ - 259, -/**/ - 258, -/**/ - 257, -/**/ - 256, -/**/ - 255, -/**/ - 254, -/**/ - 253, -/**/ - 252, -/**/ - 251, -/**/ - 250, -/**/ - 249, -/**/ - 248, -/**/ - 247, -/**/ - 246, -/**/ - 245, -/**/ - 244, -/**/ - 243, -/**/ - 242, -/**/ - 241, -/**/ - 240, -/**/ - 239, -/**/ - 238, -/**/ - 237, -/**/ - 236, -/**/ - 235, -/**/ - 234, -/**/ - 233, -/**/ - 232, -/**/ - 231, -/**/ - 230, -/**/ - 229, -/**/ - 228, -/**/ - 227, -/**/ - 226, -/**/ - 225, -/**/ - 224, -/**/ - 223, -/**/ - 222, -/**/ - 221, -/**/ - 220, -/**/ - 219, -/**/ - 218, -/**/ - 217, -/**/ - 216, -/**/ - 215, -/**/ - 214, -/**/ - 213, -/**/ - 212, -/**/ - 211, -/**/ - 210, -/**/ - 209, -/**/ - 208, -/**/ - 207, -/**/ - 206, -/**/ - 205, -/**/ - 204, -/**/ - 203, -/**/ - 202, -/**/ - 201, -/**/ - 200, -/**/ - 199, -/**/ - 198, -/**/ - 197, -/**/ - 196, -/**/ - 195, -/**/ - 194, -/**/ - 193, -/**/ - 192, -/**/ - 191, -/**/ - 190, -/**/ - 189, -/**/ - 188, -/**/ - 187, -/**/ - 186, -/**/ - 185, -/**/ - 184, -/**/ - 183, -/**/ - 182, -/**/ - 181, -/**/ - 180, -/**/ - 179, -/**/ - 178, -/**/ - 177, -/**/ - 176, -/**/ - 175, -/**/ - 174, -/**/ - 173, -/**/ - 172, -/**/ - 171, -/**/ - 170, -/**/ - 169, -/**/ - 168, -/**/ - 167, -/**/ - 166, -/**/ - 165, -/**/ - 164, -/**/ - 163, -/**/ - 162, -/**/ - 161, -/**/ - 160, -/**/ - 159, -/**/ - 158, -/**/ - 157, -/**/ - 156, -/**/ - 155, -/**/ - 154, -/**/ - 153, -/**/ - 152, -/**/ - 151, -/**/ - 150, -/**/ - 149, -/**/ - 148, -/**/ - 147, -/**/ - 146, -/**/ - 145, -/**/ - 144, -/**/ - 143, -/**/ - 142, -/**/ - 141, -/**/ - 140, -/**/ - 139, -/**/ - 138, -/**/ - 137, -/**/ - 136, -/**/ - 135, -/**/ - 134, -/**/ - 133, -/**/ - 132, -/**/ - 131, -/**/ - 130, -/**/ - 129, -/**/ - 128, -/**/ - 127, -/**/ - 126, -/**/ - 125, -/**/ - 124, -/**/ - 123, -/**/ - 122, -/**/ - 121, -/**/ - 120, -/**/ - 119, -/**/ - 118, -/**/ - 117, -/**/ - 116, -/**/ - 115, -/**/ - 114, -/**/ - 113, -/**/ - 112, -/**/ - 111, -/**/ - 110, -/**/ - 109, -/**/ - 108, -/**/ - 107, -/**/ - 106, -/**/ - 105, -/**/ - 104, -/**/ - 103, -/**/ - 102, -/**/ - 101, -/**/ - 100, -/**/ - 99, -/**/ - 98, -/**/ - 97, -/**/ - 96, -/**/ - 95, -/**/ - 94, -/**/ - 93, -/**/ - 92, -/**/ - 91, -/**/ - 90, -/**/ - 89, -/**/ - 88, -/**/ - 87, -/**/ - 86, -/**/ - 85, -/**/ - 84, -/**/ - 83, -/**/ - 82, -/**/ - 81, -/**/ - 80, -/**/ - 79, -/**/ - 78, -/**/ - 77, -/**/ - 76, -/**/ - 75, -/**/ - 74, -/**/ - 73, -/**/ - 72, -/**/ - 71, -/**/ - 70, -/**/ - 69, -/**/ - 68, -/**/ - 67, -/**/ - 66, -/**/ - 65, -/**/ - 64, -/**/ - 63, -/**/ - 62, -/**/ - 61, -/**/ - 60, -/**/ - 59, -/**/ - 58, -/**/ - 57, -/**/ - 56, -/**/ - 55, -/**/ - 54, -/**/ - 53, -/**/ - 52, -/**/ - 51, -/**/ - 50, -/**/ - 49, -/**/ - 48, -/**/ - 47, -/**/ - 46, -/**/ - 45, -/**/ - 44, -/**/ - 43, -/**/ - 42, -/**/ - 41, -/**/ - 40, -/**/ - 39, -/**/ - 38, -/**/ - 37, -/**/ - 36, -/**/ - 35, -/**/ - 34, -/**/ - 33, -/**/ - 32, -/**/ - 31, -/**/ - 30, -/**/ - 29, -/**/ - 28, -/**/ - 27, -/**/ - 26, -/**/ - 25, -/**/ - 24, -/**/ - 23, -/**/ - 22, -/**/ - 21, -/**/ - 20, -/**/ - 19, -/**/ - 18, -/**/ - 17, -/**/ - 16, -/**/ - 15, -/**/ - 14, -/**/ - 13, -/**/ - 12, -/**/ - 11, -/**/ - 10, -/**/ - 9, -/**/ - 8, -/**/ - 7, -/**/ - 6, -/**/ - 5, -/**/ - 4, -/**/ - 3, -/**/ - 2, /**/ 1, /**/ diff --git a/src/version.h b/src/version.h index 0a9ac4d8fb..9c460ea987 100644 --- a/src/version.h +++ b/src/version.h @@ -16,11 +16,11 @@ #define VIM_TOSTR(a) VIM_TOSTR_(a) // Values that change for a new release. -#define VIM_VERSION_MAJOR 8 -#define VIM_VERSION_MINOR 2 -#define VIM_VERSION_BUILD 283 -#define VIM_VERSION_BUILD_BCD 0x11b -#define VIM_VERSION_DATE_ONLY "2019 Dec 12" +#define VIM_VERSION_MAJOR 9 +#define VIM_VERSION_MINOR 0 +#define VIM_VERSION_BUILD 284 +#define VIM_VERSION_BUILD_BCD 0x11c +#define VIM_VERSION_DATE_ONLY "2022 Jun 28" // Values based on the above #define VIM_VERSION_MAJOR_STR VIM_TOSTR(VIM_VERSION_MAJOR) diff --git a/src/vim.h b/src/vim.h index aa7052505a..3ee61074cd 100644 --- a/src/vim.h +++ b/src/vim.h @@ -1662,7 +1662,7 @@ void *vim_memset(void *, int, size_t); /* * defines to avoid typecasts from (char_u *) to (char *) and back - * (vim_strchr() and vim_strrchr() are now in alloc.c) + * (vim_strchr() and vim_strrchr() are now in strings.c) */ #define STRLEN(s) strlen((char *)(s)) #define STRCPY(d, s) strcpy((char *)(d), (char *)(s)) diff --git a/src/vim.manifest b/src/vim.manifest index 9ca50ec275..ff30fbc389 100644 --- a/src/vim.manifest +++ b/src/vim.manifest @@ -8,7 +8,7 @@