Patch 8.2.2824

6 views
Skip to first unread message

Bram Moolenaar

unread,
May 2, 2021, 1:16:11 PM5/2/21
to vim...@googlegroups.com

Patch 8.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.
Files: Filelist, src/testdir/shared.vim,
src/testdir/test_function_lists.vim


*** ../vim-8.2.2823/Filelist 2021-03-13 13:30:00.139449053 +0100
--- Filelist 2021-05-02 18:00:49.246812474 +0200
***************
*** 437,443 ****
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 \
--- 437,442 ----
***************
*** 461,467 ****
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 \
--- 460,465 ----
***************
*** 481,486 ****
--- 479,485 ----

# 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,498 ****
--- 492,498 ----
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 \
*** ../vim-8.2.2823/src/testdir/shared.vim 2020-11-05 20:50:45.331984998 +0100
--- src/testdir/shared.vim 2021-05-02 18:35:32.868258021 +0200
***************
*** 21,26 ****
--- 21,28 ----
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')
*** ../vim-8.2.2823/src/testdir/test_function_lists.vim 2020-06-04 17:19:01.581522349 +0200
--- src/testdir/test_function_lists.vim 2021-05-02 18:49:42.809723118 +0200
***************
*** 55,61 ****
" Verify that the ":help functions" list is complete and in ASCII order.

enew!
! read ../../runtime/doc/eval.txt
call search('\*functions\*$')
call search('^USAGE')
1,.d
--- 55,66 ----
" Verify that the ":help functions" list is complete and in ASCII order.

enew!
! 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,81 ****
" Verify that the ":help function-list" list is complete.

enew!
! read ../../runtime/doc/usr_41.txt
call search('\*function-list\*$')
1,.d
call search('^==*$')
--- 80,91 ----
" Verify that the ":help function-list" list is complete.

enew!
! 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('^==*$')
*** ../vim-8.2.2823/src/version.c 2021-05-02 13:59:41.881471815 +0200
--- src/version.c 2021-05-02 17:56:20.619845348 +0200
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2824,
/**/

--
'Psychologist' -- Someone who looks at everyone else when
an attractive woman enters the room.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages