From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 27 Jun 2021 17:02:52 +0000 (+0200)
Subject: patch 8.2.3067: building fails with Athena
X-Git-Tag: v8.2.3067
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d1ce613cdc74721499660b1d8911de164e2862d;p=vim

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 2539515bc..d3b2cde65 100644
--- 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 5c18d5d22..762e332ed 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 b32eb1a37..f01f73a42 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 9bb7c4f98..c43fd3ff4 100644
--- 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,
 /**/