patch 8.2.3067: building fails with Athena

Problem:    Building fails with Athena. (Elimar Riesebieter)
Solution:   Adjust #ifdefs and add the 'drop_file' feature.

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 2539515bc8aa9a00ec29a59f8d705cdadae84d30..d3b2cde6570981944d495d32ff7c3b957ee5e0fb 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -4576,6 +4576,13 @@ f_has(typval_T *argvars, typval_T *rettv)
                1
 #else
                0
+#endif
+               },
+       {"drop_file",
+#ifdef HAVE_DROP_FILE
+               1
+#else
+               0
 #endif
                },
        {"emacs_tags",

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 5c18d5d227eca4f1bb9ca80b2cbde7af3f2cb554..762e332edc7ac1699eef105affa422236b4a3857 100644 (file)
--- 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 b32eb1a374650abc2906806109a3a0008b8c6d93..f01f73a42eb3869b5a42cfc14800b4d7914464a0 100644 (file)
--- 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 9bb7c4f9816683c3921665a86150868b9661251c..c43fd3ff4a7902d8a708fad1586bdb30b0e61ecd 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3067,
 /**/
     3066,
 /**/