summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-08-07 22:42:53 +0200
committerBram Moolenaar <Bram@vim.org>2018-08-07 22:42:53 +0200
commit980bab457ebb4df4b05d54b9d731520774f20d1d (patch)
treee99d770308877522d087a0c6d8d84b4704f6a308
parent40385dbcdfb44885f2e9b83e1e0285aeb8a0c2a8 (diff)
downloadvim-git-980bab457ebb4df4b05d54b9d731520774f20d1d.tar.gz
patch 8.1.0254: cannot build on MS-Windows; unused macro HAVE_HANDLE_DROPv8.1.0254
Problem: Cannot build on MS-Windows; Unused macro HAVE_HANDLE_DROP. Solution: Adjust #ifdef. Delete the macro.
-rw-r--r--src/main.c2
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h7
3 files changed, 3 insertions, 8 deletions
diff --git a/src/main.c b/src/main.c
index b8390508d..d3a509be3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -706,7 +706,7 @@ vim_main2(void)
scroll_region_reset(); /* In case Rows changed */
scroll_start(); /* may scroll the screen to the right position */
-#ifdef FEAT_TITLE
+#if defined(FEAT_TITLE) && (defined(UNIX) || defined(VMS) || defined(MACOS_X))
term_push_title(SAVE_RESTORE_BOTH);
#endif
diff --git a/src/version.c b/src/version.c
index 8b0124820..099ea1fa2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 254,
+/**/
253,
/**/
252,
diff --git a/src/vim.h b/src/vim.h
index 524ed9213..5166f533c 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2548,13 +2548,6 @@ typedef enum {
#define TERM_START_FORCEIT 2
#define TERM_START_SYSTEM 4
-#if defined(HAVE_DROP_FILE) \
- || (defined(FEAT_GUI_GTK) && defined(FEAT_DND)) \
- || defined(FEAT_GUI_MSWIN) \
- || defined(FEAT_GUI_MAC)
-# define HAVE_HANDLE_DROP
-#endif
-
// Used for icon/title save and restore.
#define SAVE_RESTORE_TITLE 1
#define SAVE_RESTORE_ICON 2