aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt6
-rw-r--r--CONTRIBUTING.md3
-rw-r--r--cmake.deps/CMakeLists.txt5
-rw-r--r--cmake.deps/deps.txt4
-rw-r--r--runtime/autoload/dist/vim.vim32
-rw-r--r--runtime/autoload/gzip.vim5
-rw-r--r--runtime/autoload/tar.vim17
-rw-r--r--runtime/autoload/zip.vim6
-rw-r--r--runtime/ftplugin/awk.vim4
-rw-r--r--runtime/ftplugin/changelog.vim4
-rw-r--r--runtime/ftplugin/perl.vim7
-rw-r--r--runtime/ftplugin/zig.vim5
-rw-r--r--runtime/keymap/arabic_utf-8.vim12
-rw-r--r--src/nvim/CMakeLists.txt23
-rw-r--r--test/old/testdir/test_arabic.vim6
15 files changed, 74 insertions, 65 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a360c6043f..a7b7ef9c0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,12 +157,6 @@ if((ENABLE_ASAN_UBSAN AND ENABLE_MSAN)
message(FATAL_ERROR "Sanitizers cannot be enabled simultaneously")
endif()
-if(ENABLE_ASAN_UBSAN OR ENABLE_MSAN OR ENABLE_TSAN)
- if(NOT CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_C_COMPILER_ID MATCHES "GNU")
- message(FATAL_ERROR "Sanitizers are only supported for Clang and GCC")
- endif()
-endif()
-
# Place targets in bin/ or lib/ for all build configurations
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2128b3af13..c39f6db5d1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -125,7 +125,8 @@ Each pull request must pass the automated builds on [Cirrus CI] and [GitHub Acti
- If any tests fail, the build will fail. See [test/README.md#running-tests][run-tests] to run tests locally.
- CI runs [ASan] and other analyzers.
- To run valgrind locally: `VALGRIND=1 make test`
- - To run Clang ASan/UBSan locally: `CC=clang make CMAKE_FLAGS="-DENABLE_ASAN_UBSAN=ON"`
+ - To run ASan/UBSan locally: `CC=clang make CMAKE_FLAGS="-DENABLE_ASAN_UBSAN=ON"`.
+ Note that MSVC requires Release or RelWithDebInfo build type to work properly.
- The [lint](#lint) build checks modified lines _and their immediate
neighbors_, to encourage incrementally updating the legacy style to meet our
[style](#style). (See [#3174][3174] for background.)
diff --git a/cmake.deps/CMakeLists.txt b/cmake.deps/CMakeLists.txt
index cc331212c4..6dc6fcdc72 100644
--- a/cmake.deps/CMakeLists.txt
+++ b/cmake.deps/CMakeLists.txt
@@ -57,11 +57,6 @@ endif()
option(USE_EXISTING_SRC_DIR "Skip download of deps sources in case of existing source directory." OFF)
-find_package(Git)
-if(NOT Git_FOUND)
- message(FATAL_ERROR "Git is required to apply patches.")
-endif()
-
# If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET),
# fall back to local system version. Needs to be done here and in top-level CMakeLists.txt.
if(APPLE)
diff --git a/cmake.deps/deps.txt b/cmake.deps/deps.txt
index fd7b72346b..9088e18593 100644
--- a/cmake.deps/deps.txt
+++ b/cmake.deps/deps.txt
@@ -4,8 +4,8 @@ LIBUV_SHA256 7aa66be3413ae10605e1f5c9ae934504ffe317ef68ea16fdaa83e23905c681bd
MSGPACK_URL https://github.com/msgpack/msgpack-c/releases/download/c-6.0.0/msgpack-c-6.0.0.tar.gz
MSGPACK_SHA256 3654f5e2c652dc52e0a993e270bb57d5702b262703f03771c152bba51602aeba
-LUAJIT_URL https://github.com/LuaJIT/LuaJIT/archive/0afa1676b2d2aabf1f3101a2692eb0f1e291076a.tar.gz
-LUAJIT_SHA256 907f9ba0b64d1a06b6da092537e0d8b6009a34f5e1405fafaa588da7fdcefe59
+LUAJIT_URL https://github.com/LuaJIT/LuaJIT/archive/07b3cd3cf9b57a3801a1ebc48144767e31671f21.tar.gz
+LUAJIT_SHA256 1e2ae83ce09250fc7c26149de70cf93416d508ad46a502ce7f4bf36d55207b85
LUA_URL https://www.lua.org/ftp/lua-5.1.5.tar.gz
LUA_SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
diff --git a/runtime/autoload/dist/vim.vim b/runtime/autoload/dist/vim.vim
new file mode 100644
index 0000000000..021244c93b
--- /dev/null
+++ b/runtime/autoload/dist/vim.vim
@@ -0,0 +1,32 @@
+" Vim runtime support library,
+" runs the vim9 script version or legacy script version
+" on demand (mostly for Neovim compatability)
+"
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Nov 04
+
+
+" enable the zip and gzip plugin by default, if not set
+if !exists('g:zip_exec')
+ let g:zip_exec = 1
+endif
+
+if !exists('g:gzip_exec')
+ let g:gzip_exec = 1
+endif
+
+if !has('vim9script')
+ function dist#vim#IsSafeExecutable(filetype, executable)
+ let cwd = getcwd()
+ return get(g:, a:filetype .. '_exec', get(g:, 'plugin_exec', 0)) &&
+ \ (fnamemodify(exepath(a:executable), ':p:h') !=# cwd
+ \ || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1 &&
+ \ cwd != '.'))
+ endfunction
+
+ finish
+endif
+
+def dist#vim#IsSafeExecutable(filetype: string, executable: string): bool
+ return dist#vim9#IsSafeExecutable(filetype, executable)
+enddef
diff --git a/runtime/autoload/gzip.vim b/runtime/autoload/gzip.vim
index 6d0bb13401..26b1cda034 100644
--- a/runtime/autoload/gzip.vim
+++ b/runtime/autoload/gzip.vim
@@ -11,10 +11,7 @@ fun s:check(cmd)
let name = substitute(a:cmd, '\(\S*\).*', '\1', '')
if !exists("s:have_" . name)
" safety check, don't execute anything from the current directory
- let s:tmp_cwd = getcwd()
- let f = (fnamemodify(exepath(name), ":p:h") !=# s:tmp_cwd
- \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
- unlet s:tmp_cwd
+ let f = dist#vim#IsSafeExecutable('gzip', name)
if !f
echoerr "Warning: NOT executing " .. name .. " from current directory!"
endif
diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
index d7d1d8399e..b31549a891 100644
--- a/runtime/autoload/tar.vim
+++ b/runtime/autoload/tar.vim
@@ -1,7 +1,7 @@
" tar.vim: Handles browsing tarfiles
" AUTOLOAD PORTION
-" Date: Jan 07, 2020
-" Version: 32
+" Date: Nov 05, 2023
+" Version: 32a (with modifications from the Vim Project)
" Maintainer: Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
" License: Vim License (see vim's :help license)
"
@@ -22,7 +22,7 @@
if &cp || exists("g:loaded_tar")
finish
endif
-let g:loaded_tar= "v32"
+let g:loaded_tar= "v32a"
if v:version < 702
echohl WarningMsg
echo "***warning*** this version of tar needs vim 7.2"
@@ -208,7 +208,16 @@ fun! tar#Browse(tarfile)
" call Dret("tar#Browse : a:tarfile<".a:tarfile.">")
return
endif
- if line("$") == curlast || ( line("$") == (curlast + 1) && getline("$") =~# '\c\%(warning\|error\|inappropriate\|unrecognized\)')
+ " If there was an error message, the last line probably matches some keywords but
+ " should also contain whitespace for readability. Make sure not to match a
+ " filename that contains the keyword (error/warning/unrecognized/inappropriate, etc)
+ "
+ " FIXME:is this actually necessary? In case of an error, we should probably
+ " have noticed in the if statement above since tar should have exited
+ " with a non-zero exit code.
+ if line("$") == curlast || ( line("$") == (curlast + 1) &&
+ \ getline("$") =~# '\c\<\%(warning\|error\|inappropriate\|unrecognized\)\>' &&
+ \ getline("$") =~ '\s' )
redraw!
echohl WarningMsg | echo "***warning*** (tar#Browse) ".a:tarfile." doesn't appear to be a tar file" | echohl None
keepj sil! %d
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index 8b39c91c3a..e61293c357 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -57,14 +57,10 @@ if !exists("g:zip_extractcmd")
let g:zip_extractcmd= g:zip_unzipcmd
endif
-let s:tmp_cwd = getcwd()
-if (fnamemodify(exepath(g:zip_unzipcmd), ":p:h") ==# getcwd()
- \ && (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) == -1 || s:tmp_cwd == '.'))
- unlet s:tmp_cwd
+if !dist#vim#IsSafeExecutable('zip', g:zip_unzipcmd)
echoerr "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!"
finish
endif
-unlet s:tmp_cwd
" ----------------
" Functions: {{{1
diff --git a/runtime/ftplugin/awk.vim b/runtime/ftplugin/awk.vim
index 785088ff9b..40fe304cf4 100644
--- a/runtime/ftplugin/awk.vim
+++ b/runtime/ftplugin/awk.vim
@@ -37,8 +37,8 @@ if exists("g:awk_is_gawk")
let b:undo_ftplugin .= " | setl fp<"
endif
- " Disabled by default for security reasons.
- if get(g:, 'awk_exec', get(g:, 'plugin_exec', 0))
+ " Disabled by default for security reasons.
+ if dist#vim#IsSafeExecutable('awk', 'gawk')
let path = system("gawk 'BEGIN { printf ENVIRON[\"AWKPATH\"] }'")
let path = substitute(path, '^\.\=:\|:\.\=$\|:\.\=:', ',,', 'g') " POSIX cwd
let path = substitute(path, ':', ',', 'g')
diff --git a/runtime/ftplugin/changelog.vim b/runtime/ftplugin/changelog.vim
index a62433378a..ab73949be5 100644
--- a/runtime/ftplugin/changelog.vim
+++ b/runtime/ftplugin/changelog.vim
@@ -57,8 +57,8 @@ if &filetype == 'changelog'
endif
let s:default_login = 'unknown'
- " Disabled by default for security reasons.
- if get(g:, 'changelog_exec', get(g:, 'plugin_exec', 0))
+ " Disabled by default for security reasons.
+ if dist#vim#IsSafeExecutable('changelog', 'whoami')
let login = s:login()
else
let login = s:default_login
diff --git a/runtime/ftplugin/perl.vim b/runtime/ftplugin/perl.vim
index 7ea0ae980a..c63bd3f9c7 100644
--- a/runtime/ftplugin/perl.vim
+++ b/runtime/ftplugin/perl.vim
@@ -56,12 +56,8 @@ endif
" Set this once, globally.
if !exists("perlpath")
- let s:tmp_cwd = getcwd()
" safety check: don't execute perl binary by default
- if executable("perl") && get(g:, 'perl_exec', get(g:, 'plugin_exec', 0))
- \ && (fnamemodify(exepath("perl"), ":p:h") != s:tmp_cwd
- \ || (index(split($PATH, has("win32") ? ';' : ':'), s:tmp_cwd) != -1
- \ && s:tmp_cwd != '.'))
+ if dist#vim#IsSafeExecutable('perl', 'perl')
try
if &shellxquote != '"'
let perlpath = system('perl -e "print join(q/,/,@INC)"')
@@ -77,7 +73,6 @@ if !exists("perlpath")
" current directory and the directory of the current file.
let perlpath = ".,,"
endif
- unlet! s:tmp_cwd
endif
" Append perlpath to the existing path value, if it is set. Since we don't
diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim
index 291fe44b11..28b8cd5a67 100644
--- a/runtime/ftplugin/zig.vim
+++ b/runtime/ftplugin/zig.vim
@@ -41,16 +41,13 @@ let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
" Safety check: don't execute zig from current directory
if !exists('g:zig_std_dir') && exists('*json_decode') &&
- \ executable('zig') && get(g:, 'zig_exec', get(g:, 'plugin_exec', 0))
- \ && (fnamemodify(exepath("zig"), ":p:h") != s:tmp_cwd
- \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
+ \ executable('zig') && dist#vim#IsSafeExecutable('zig', 'zig')
silent let s:env = system('zig env')
if v:shell_error == 0
let g:zig_std_dir = json_decode(s:env)['std_dir']
endif
unlet! s:env
endif
-unlet! s:tmp_cwd
if exists('g:zig_std_dir')
let &l:path = g:zig_std_dir . ',' . &l:path
diff --git a/runtime/keymap/arabic_utf-8.vim b/runtime/keymap/arabic_utf-8.vim
index aeb4a4f398..60fd05fc81 100644
--- a/runtime/keymap/arabic_utf-8.vim
+++ b/runtime/keymap/arabic_utf-8.vim
@@ -1,7 +1,7 @@
" Vim Keymap file for Arabic
" Maintainer : Arabic Support group <support-at-arabeyes.org>
" Created by : Nadim Shaikli <nadim-at-arabeyes.org>
-" Last Updated : 2003 Apr 26
+" Last Updated : 2023-10-27
" This is for a standard Microsoft Arabic keyboard layout.
" Use this short name in the status line.
@@ -41,16 +41,6 @@ m <char-0x0629> " (1577) - TEH MARBUTA
, <char-0x0648> " (1608) - WAW
. <char-0x0632> " (1586) - ZAIN
/ <char-0x0638> " (1592) - ZAH
-0 <char-0x0660> " (1632) - Arabic 0
-1 <char-0x0661> " (1633) - Arabic 1
-2 <char-0x0662> " (1634) - Arabic 2
-3 <char-0x0663> " (1635) - Arabic 3
-4 <char-0x0664> " (1636) - Arabic 4
-5 <char-0x0665> " (1637) - Arabic 5
-6 <char-0x0666> " (1638) - Arabic 6
-7 <char-0x0667> " (1639) - Arabic 7
-8 <char-0x0668> " (1640) - Arabic 8
-9 <char-0x0669> " (1641) - Arabic 9
` <char-0x0630> " (1584) - THAL
~ <char-0x0651> " (1617) - Tanween -- SHADDA
Q <char-0x064e> " (1614) - Tanween -- FATHA
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 71e99538c7..e881214f40 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -764,17 +764,20 @@ target_link_libraries(libnvim PRIVATE main_lib PUBLIC libuv)
if(ENABLE_ASAN_UBSAN)
message(STATUS "Enabling address sanitizer and undefined behavior sanitizer for nvim.")
- if(CI_BUILD)
- # Try to recover from all sanitize issues so we get reports about all failures
- target_compile_options(nvim PRIVATE -fsanitize-recover=all)
- else()
- target_compile_options(nvim PRIVATE -fno-sanitize-recover=all)
+ if(NOT MSVC)
+ if(CI_BUILD)
+ # Try to recover from all sanitize issues so we get reports about all failures
+ target_compile_options(nvim PRIVATE -fsanitize-recover=all)
+ else()
+ target_compile_options(nvim PRIVATE -fno-sanitize-recover=all)
+ endif()
+ target_compile_options(nvim PRIVATE
+ -fno-omit-frame-pointer
+ -fno-optimize-sibling-calls
+ -fsanitize=undefined)
endif()
- target_compile_options(nvim PRIVATE
- -fno-omit-frame-pointer
- -fno-optimize-sibling-calls
- -fsanitize=address
- -fsanitize=undefined)
+
+ target_compile_options(nvim PRIVATE -fsanitize=address)
target_link_libraries(nvim PRIVATE -fsanitize=address -fsanitize=undefined)
target_compile_definitions(nvim PRIVATE ENABLE_ASAN_UBSAN)
elseif(ENABLE_MSAN)
diff --git a/test/old/testdir/test_arabic.vim b/test/old/testdir/test_arabic.vim
index 272937387d..8f150090ed 100644
--- a/test/old/testdir/test_arabic.vim
+++ b/test/old/testdir/test_arabic.vim
@@ -74,9 +74,9 @@ endfunc
func Test_arabic_toggle_keymap()
new
set arabic
- call feedkeys("i12\<C-^>12\<C-^>12", 'tx')
- call assert_match("^ *٢١21٢١$", ScreenLines(1, &columns)[0])
- call assert_equal('١٢12١٢', getline('.'))
+ call feedkeys("i12\<C-^>12\<C-^>12abcd", 'tx')
+ call assert_match("^ *.*ﺷ212121$", ScreenLines(1, &columns)[0])
+ call assert_equal('121212شلاؤي', getline('.'))
set arabic&
bwipe!
endfunc
generated by cgit (git 2.34.1) at 2025-06-24 17:30:44 +0000