diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-06-27 19:02:52 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-06-27 19:02:52 +0200 |
| commit | 1d1ce613cdc74721499660b1d8911de164e2862d (patch) | |
| tree | 0405fa994373f498edf7fb831805db428afcda37 | |
| parent | 17d868b8b268c9b9670421039d1a772341937add (diff) | |
patch 8.2.3067: building fails with Athenav8.2.3067
Problem: Building fails with Athena. (Elimar Riesebieter)
Solution: Adjust #ifdefs and add the 'drop_file' feature.
| -rw-r--r-- | src/evalfunc.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_gui.vim | 4 | ||||
| -rw-r--r-- | src/testing.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 14 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 2539515bc8..d3b2cde657 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -4578,6 +4578,13 @@ f_has(typval_T *argvars, typval_T *rettv) 0 #endif }, + {"drop_file", +#ifdef HAVE_DROP_FILE + 1 +#else + 0 +#endif + }, {"emacs_tags", #ifdef FEAT_EMACS_TAGS 1 diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index 5c18d5d227..762e332edc 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -1160,12 +1160,16 @@ endfunc " Test for dropping files into a window in GUI func DropFilesInCmdLine() + CheckFeature drop_file + call feedkeys(":\"", 'L') call test_gui_drop_files(['a.c', 'b.c'], &lines, 1, 0) call feedkeys("\<CR>", 'L') endfunc func Test_gui_drop_files() + CheckFeature drop_file + call assert_fails('call test_gui_drop_files(1, 1, 1, 0)', 'E474:') call assert_fails('call test_gui_drop_files(["x"], "", 1, 0)', 'E474:') call assert_fails('call test_gui_drop_files(["x"], 1, "", 0)', 'E474:') diff --git a/src/testing.c b/src/testing.c index b32eb1a374..f01f73a42e 100644 --- a/src/testing.c +++ b/src/testing.c @@ -1260,7 +1260,7 @@ f_test_settime(typval_T *argvars, typval_T *rettv UNUSED) void f_test_gui_drop_files(typval_T *argvars UNUSED, typval_T *rettv UNUSED) { -# ifdef FEAT_GUI +#if defined(HAVE_DROP_FILE) int row; int col; int_u mods; diff --git a/src/version.c b/src/version.c index 9bb7c4f981..c43fd3ff4a 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3067, +/**/ 3066, /**/ 3065, |