summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-01-02 16:53:13 +0100
committerBram Moolenaar <Bram@vim.org>2021-01-02 16:53:13 +0100
commita72514945bc3edd4fc4d745004e37c5d5487c98d (patch)
tree8be6f3c985e10ae5c3741e5af54beab49a54648b
parent7e6a515ed14e204fafb3dd6e98f2fb543e64aedd (diff)
downloadvim-git-a72514945bc3edd4fc4d745004e37c5d5487c98d.tar.gz
patch 8.2.2276: list of distributed files is outdatedv8.2.2276
Problem: List of distributed files is outdated. Solution: Update the file list. Minor comment updates.
-rw-r--r--Filelist15
-rw-r--r--src/clipboard.c2
-rw-r--r--src/fileio.c1
-rw-r--r--src/option.c2
-rw-r--r--src/screen.c1
-rw-r--r--src/testdir/Make_vms.mms2
-rw-r--r--src/testdir/test_signals.vim8
-rw-r--r--src/version.c2
8 files changed, 18 insertions, 15 deletions
diff --git a/Filelist b/Filelist
index a8ee3415e..5151869e0 100644
--- a/Filelist
+++ b/Filelist
@@ -3,20 +3,23 @@
# source files for all source archives
SRC_ALL = \
- .gitignore \
+ .cirrus.yml \
+ .coveralls.yml
.gitattributes \
+ .github/CODEOWNERS \
+ .github/workflows/ci.yml \
+ .github/workflows/codeql-analysis.yml \
+ .gitignore \
.hgignore \
.lgtm.yml \
.travis.yml \
- .cirrus.yml \
- .github/workflows/ci.yml \
- .github/workflows/codeql-analysis.yml \
- .github/CODEOWNERS \
appveyor.yml \
ci/appveyor.bat \
+ ci/build-snd-dummy.sh \
+ ci/config.mk*.sed \
ci/if_ver*.vim \
ci/load-snd-dummy.sh \
- ci/config.mk*.sed \
+ ci/setup-xvfb.sh \
src/Make_all.mak \
src/README.md \
src/alloc.h \
diff --git a/src/clipboard.c b/src/clipboard.c
index 3084ce187..c26349291 100644
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -2047,6 +2047,8 @@ clip_get_selection(Clipboard_T *cbd)
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;
diff --git a/src/fileio.c b/src/fileio.c
index 66061680b..b3b7100d6 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2280,6 +2280,7 @@ failed:
else
{
int fdflags = fcntl(fd, F_GETFD);
+
if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
(void)fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
}
diff --git a/src/option.c b/src/option.c
index ca6fadb50..094a72354 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3835,7 +3835,7 @@ findoption(char_u *arg)
*
* Returns:
* Number option: gov_number, *numval gets value.
- * Tottle option: gov_bool, *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.
diff --git a/src/screen.c b/src/screen.c
index 7c6fe63e1..60544b6e9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3087,7 +3087,6 @@ windgoto(int row, int col)
// Can't use ScreenLines unless initialized
if (ScreenLines == NULL)
return;
-
if (col != screen_cur_col || row != screen_cur_row)
{
// Check for valid position.
diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 1e4f0d56f..b6c6fabae 100644
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -4,7 +4,7 @@
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
#
-# Last change: 2020 Aug 13
+# 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.
diff --git a/src/testdir/test_signals.vim b/src/testdir/test_signals.vim
index 1723f3310..72fd02433 100644
--- a/src/testdir/test_signals.vim
+++ b/src/testdir/test_signals.vim
@@ -85,8 +85,8 @@ func Test_signal_INT()
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.
+ " 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,10 +119,6 @@ func Test_deadly_signal_TERM()
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.
diff --git a/src/version.c b/src/version.c
index e6df8768a..b34412942 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 */
/**/
+ 2276,
+/**/
2275,
/**/
2274,