Patch 8.2.2276

10 views
Skip to first unread message

Bram Moolenaar

unread,
Jan 2, 2021, 10:53:49 AM1/2/21
to vim...@googlegroups.com

Patch 8.2.2276
Problem: List of distributed files is outdated.
Solution: Update the file list. Minor comment updates.
Files: Filelist, src/clipboard.c, src/fileio.c, src/option.c,
src/screen.c, src/testdir/test_signals.vim,
src/testdir/Make_vms.mms


*** ../vim-8.2.2275/Filelist 2020-12-22 19:05:29.454177553 +0100
--- Filelist 2020-12-23 13:56:12.373478161 +0100
***************
*** 3,22 ****

# source files for all source archives
SRC_ALL = \
! .gitignore \
.gitattributes \
.hgignore \
.lgtm.yml \
.travis.yml \
- .cirrus.yml \
- .github/workflows/ci.yml \
- .github/workflows/codeql-analysis.yml \
- .github/CODEOWNERS \
appveyor.yml \
ci/appveyor.bat \
ci/if_ver*.vim \
ci/load-snd-dummy.sh \
! ci/config.mk*.sed \
src/Make_all.mak \
src/README.md \
src/alloc.h \
--- 3,25 ----

# source files for all source archives
SRC_ALL = \
! .cirrus.yml \
! .coveralls.yml
.gitattributes \
+ .github/CODEOWNERS \
+ .github/workflows/ci.yml \
+ .github/workflows/codeql-analysis.yml \
+ .gitignore \
.hgignore \
.lgtm.yml \
.travis.yml \
appveyor.yml \
ci/appveyor.bat \
+ ci/build-snd-dummy.sh \
+ ci/config.mk*.sed \
ci/if_ver*.vim \
ci/load-snd-dummy.sh \
! ci/setup-xvfb.sh \
src/Make_all.mak \
src/README.md \
src/alloc.h \
*** ../vim-8.2.2275/src/clipboard.c 2020-11-26 20:33:56.856583887 +0100
--- src/clipboard.c 2020-12-22 20:09:19.418907068 +0100
***************
*** 2047,2052 ****
--- 2047,2054 ----
ca.count1 = 1;
ca.retval = CA_NO_ADJ_OP_END;
do_pending_operator(&ca, 0, TRUE);
+
+ // restore things
set_y_previous(old_y_previous);
set_y_current(old_y_current);
curwin->w_cursor = old_cursor;
*** ../vim-8.2.2275/src/fileio.c 2020-11-26 19:47:24.359855019 +0100
--- src/fileio.c 2020-12-08 19:10:49.351450810 +0100
***************
*** 2280,2285 ****
--- 2280,2286 ----
else
{
int fdflags = fcntl(fd, F_GETFD);
+
if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
(void)fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
}
*** ../vim-8.2.2275/src/option.c 2020-12-31 17:40:57.536087870 +0100
--- src/option.c 2020-12-31 21:42:09.423824009 +0100
***************
*** 3835,3841 ****
*
* Returns:
* Number option: gov_number, *numval gets value.
! * Tottle option: gov_bool, *numval gets value.
* String option: gov_string, *stringval gets allocated string.
* Hidden Number option: gov_hidden_number.
* Hidden Toggle option: gov_hidden_bool.
--- 3835,3841 ----
*
* Returns:
* Number option: gov_number, *numval gets value.
! * Toggle option: gov_bool, *numval gets value.
* String option: gov_string, *stringval gets allocated string.
* Hidden Number option: gov_hidden_number.
* Hidden Toggle option: gov_hidden_bool.
*** ../vim-8.2.2275/src/screen.c 2020-11-12 14:20:32.025927280 +0100
--- src/screen.c 2020-11-29 14:35:56.714783930 +0100
***************
*** 3087,3093 ****
// Can't use ScreenLines unless initialized
if (ScreenLines == NULL)
return;
-
if (col != screen_cur_col || row != screen_cur_row)
{
// Check for valid position.
--- 3087,3092 ----
*** ../vim-8.2.2275/src/testdir/test_signals.vim 2020-12-06 15:03:14.821379868 +0100
--- src/testdir/test_signals.vim 2021-01-02 16:52:16.750259798 +0100
***************
*** 85,92 ****
throw 'Skipped: INT signal not supported'
endif

! " Skip the rest of the test when running with valgrind as signal INT is not
! " received somehow by Vim when running with valgrind.
let cmd = GetVimCommand()
if cmd =~ 'valgrind'
throw 'Skipped: cannot test signal INT with valgrind'
--- 85,92 ----
throw 'Skipped: INT signal not supported'
endif

! " Skip the test when running with valgrind as signal INT is not received
! " somehow by Vim when running with valgrind.
let cmd = GetVimCommand()
if cmd =~ 'valgrind'
throw 'Skipped: cannot test signal INT with valgrind'
***************
*** 119,128 ****
throw 'Skipped: TERM signal not supported'
endif
CheckRunVimInTerminal
- let cmd = GetVimCommand()
- if cmd =~ 'valgrind'
- throw 'Skipped: cannot test signal TERM with valgrind'
- endif

" If test fails once, it can leave temporary files and trying to rerun
" the test would then fail again if they are not deleted first.
--- 119,124 ----
*** ../vim-8.2.2275/src/testdir/Make_vms.mms 2020-08-14 19:20:19.790506736 +0200
--- src/testdir/Make_vms.mms 2020-08-14 19:19:06.755021930 +0200
***************
*** 4,10 ****
# Authors: Zoltan Arpadffy, <arpa...@polarhome.com>
# Sandor Kopanyi, <sandor....@mailbox.hu>
#
! # Last change: 2020 Aug 13
#
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
# Edit the lines in the Configuration section below to select.
--- 4,10 ----
# Authors: Zoltan Arpadffy, <arpa...@polarhome.com>
# Sandor Kopanyi, <sandor....@mailbox.hu>
#
! # Last change: 2020 Aug 14
#
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
# Edit the lines in the Configuration section below to select.
*** ../vim-8.2.2275/src/version.c 2021-01-02 16:17:14.548494748 +0100
--- src/version.c 2021-01-02 16:48:24.491186860 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2276,
/**/

--
From "know your smileys":
~#:-( I just washed my hair, and I can't do nuthin' with it.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

mckel...@gmail.com

unread,
Jan 2, 2021, 11:02:52 AM1/2/21
to vim_dev
Hi,

This gets me -

Filelist:8: *** recipe commences before first target.  Stop.

on any make.

thx,
-m

Bram Moolenaar

unread,
Jan 2, 2021, 11:08:26 AM1/2/21
to vim...@googlegroups.com, mckel...@gmail.com

> This gets me -
>
> Filelist:8: *** recipe commences before first target. Stop.
>
> on any make.

Somehow I didn't notice that a backslash is missing.
Looks like it only happens when running configure.

--
From "know your smileys":
O:-) Saint

mckel...@gmail.com

unread,
Jan 2, 2021, 11:29:09 AM1/2/21
to vim_dev
Hi,

ok, thanks for fixing.

-m

Reply all
Reply to author
Forward
0 new messages