Skip to content

Commit 1d1ce61

Browse files
committed
patch 8.2.3067: building fails with Athena
Problem: Building fails with Athena. (Elimar Riesebieter) Solution: Adjust #ifdefs and add the 'drop_file' feature.
1 parent 17d868b commit 1d1ce61

4 files changed

Lines changed: 14 additions & 1 deletion

File tree

src/evalfunc.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4576,6 +4576,13 @@ f_has(typval_T *argvars, typval_T *rettv)
45764576
1
45774577
#else
45784578
0
4579+
#endif
4580+
},
4581+
{"drop_file",
4582+
#ifdef HAVE_DROP_FILE
4583+
1
4584+
#else
4585+
0
45794586
#endif
45804587
},
45814588
{"emacs_tags",

src/testdir/test_gui.vim

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,12 +1160,16 @@ endfunc
11601160

11611161
" Test for dropping files into a window in GUI
11621162
func DropFilesInCmdLine()
1163+
CheckFeature drop_file
1164+
11631165
call feedkeys(":\"", 'L')
11641166
call test_gui_drop_files(['a.c', 'b.c'], &lines, 1, 0)
11651167
call feedkeys("\<CR>", 'L')
11661168
endfunc
11671169

11681170
func Test_gui_drop_files()
1171+
CheckFeature drop_file
1172+
11691173
call assert_fails('call test_gui_drop_files(1, 1, 1, 0)', 'E474:')
11701174
call assert_fails('call test_gui_drop_files(["x"], "", 1, 0)', 'E474:')
11711175
call assert_fails('call test_gui_drop_files(["x"], 1, "", 0)', 'E474:')

src/testing.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ f_test_settime(typval_T *argvars, typval_T *rettv UNUSED)
12601260
void
12611261
f_test_gui_drop_files(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
12621262
{
1263-
# ifdef FEAT_GUI
1263+
#if defined(HAVE_DROP_FILE)
12641264
int row;
12651265
int col;
12661266
int_u mods;

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,8 @@ static char *(features[]) =
755755

756756
static int included_patches[] =
757757
{ /* Add new patch number below this line */
758+
/**/
759+
3067,
758760
/**/
759761
3066,
760762
/**/

0 commit comments

Comments
 (0)