diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-05-02 19:15:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-05-02 19:15:05 +0200 |
| commit | 1bb0da25a6581cd09d6df91f11ce866dc775597b (patch) | |
| tree | fc7bb5628d52ae2ec87ff5ee033bf86c4e9247d3 | |
| parent | 4c295027a426986566cd7a76c47a6d3a529727e7 (diff) | |
patch 8.2.2824: MS-Windows: build failure with MSVCv8.2.2824
Problem: MS-Windows: build failure with MSVC.
Solution: Adjust the list of distributed files. Add hint about python.
Adjust path for reading runtime files.
| -rw-r--r-- | Filelist | 4 | ||||
| -rw-r--r-- | src/testdir/shared.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_function_lists.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 18 insertions, 4 deletions
@@ -437,7 +437,6 @@ SRC_UNIX = \ src/gui_gtk_x11.c \ src/gui_gtk_res.xml \ src/gui_motif.c \ - src/gui_xim.c \ src/gui_xmdlg.c \ src/gui_xmebw.c \ src/gui_xmebw.h \ @@ -461,7 +460,6 @@ SRC_UNIX = \ src/proto/gui_gtk_x11.pro \ src/proto/gui_gtk_gresources.pro \ src/proto/gui_motif.pro \ - src/proto/gui_xim.pro \ src/proto/gui_xmdlg.pro \ src/proto/gui_x11.pro \ src/proto/if_xcmdsrv.pro \ @@ -481,6 +479,7 @@ SRC_UNIX = \ # source files for both DOS and Unix SRC_DOS_UNIX = \ + src/gui_xim.c \ src/if_cscope.c \ src/if_cscope.h \ src/if_lua.c \ @@ -493,6 +492,7 @@ SRC_DOS_UNIX = \ src/if_py_both.h \ src/if_ruby.c \ src/if_tcl.c \ + src/proto/gui_xim.pro \ src/proto/if_cscope.pro \ src/proto/if_lua.pro \ src/proto/if_mzsch.pro \ diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim index 3c6fe1cd36..01d741c08e 100644 --- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -21,6 +21,8 @@ func PythonProg() let s:python = 'python' elseif has('win32') " Use Python Launcher for Windows (py.exe) if available. + " NOTE: if you get a "Python was not found" error, disable the Python + " shortcuts in "Windows menu / Settings / Manage App Execution Aliases". if executable('py.exe') let s:python = 'py.exe' elseif executable('python.exe') diff --git a/src/testdir/test_function_lists.vim b/src/testdir/test_function_lists.vim index fab3363953..7bf8d4d2fc 100644 --- a/src/testdir/test_function_lists.vim +++ b/src/testdir/test_function_lists.vim @@ -55,7 +55,12 @@ func Test_function_lists() " Verify that the ":help functions" list is complete and in ASCII order. enew! - read ../../runtime/doc/eval.txt + if filereadable('../../doc/eval.txt') + " unpacked MS-Windows zip archive + read ../../doc/eval.txt + else + read ../../runtime/doc/eval.txt + endif call search('\*functions\*$') call search('^USAGE') 1,.d @@ -75,7 +80,12 @@ func Test_function_lists() " Verify that the ":help function-list" list is complete. enew! - read ../../runtime/doc/usr_41.txt + if filereadable('../../doc/usr_41.txt') + " unpacked MS-Windows zip archive + read ../../doc/usr_41.txt + else + read ../../runtime/doc/usr_41.txt + endif call search('\*function-list\*$') 1,.d call search('^==*$') diff --git a/src/version.c b/src/version.c index 0e6e3014e0..435117dacb 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2824, +/**/ 2823, /**/ 2822, |