summaryrefslogtreecommitdiffstats
path: root/src/globals.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-28 22:25:38 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-28 22:25:38 +0200
commit67cf86bfff5fd5224d557d81cb146f46e33b831c (patch)
tree3ffaca7f4014f393ceb0216a2ec8fca091019c1c /src/globals.h
parentafde13b62b8fa25dac4635d5caee8d088b937ee0 (diff)
patch 8.1.1231: asking about existing swap file unnecessarilyv8.1.1231
Problem: Asking about existing swap file unnecessarily. Solution: When it is safe, delete the swap file. Remove HAS_SWAP_EXISTS_ACTION, it is always defined. (closes #1237)
Diffstat (limited to 'src/globals.h')
-rw-r--r--src/globals.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/globals.h b/src/globals.h
index d0a8d91242..fef30a7537 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -966,7 +966,6 @@ EXTERN int emsg_silent INIT(= 0); /* don't print error messages */
EXTERN int emsg_noredir INIT(= 0); /* don't redirect error messages */
EXTERN int cmd_silent INIT(= FALSE); /* don't echo the command line */
-# define HAS_SWAP_EXISTS_ACTION
EXTERN int swap_exists_action INIT(= SEA_NONE);
/* For dialog when swap file already
* exists. */
@@ -1644,6 +1643,9 @@ EXTERN int *eval_lavars_used INIT(= NULL);
#endif
#ifdef MSWIN
+# ifdef PROTO
+typedef int HINSTANCE;
+# endif
EXTERN int ctrl_break_was_pressed INIT(= FALSE);
EXTERN HINSTANCE g_hinst INIT(= NULL);
#endif