move defines from vim.h

buffer.h:
   buflist_getfile() flags
   buflist_new() flags
   buf_freeall() flags
   do_buffer() flags

charset.h:
   chartab[] flags

edit.h:
   in_cinkeys() flags
   change_indent() flags
   beginline() flags
   insertchar() flags
   nv_mousescroll() flags

eval.c
   AUTOLOAD_CHAR

eval.h:
   enum for vimvars[]

ex_cmds.h:
   do_ecmd
   read_viminfo flags

ex_cmds2.h:
   check_changed() flags
   do_source() flags

ex_cmds_defs.h:
   BAD_* flags

ex_docmd.h:
   VALID_PATH VALID_HEAD
   EXMODE_*
   do_cmdline() flags
added include

ex_getln.c
   *_ESC_CHARS definitions

ex_getln.h:
   history table flags - used by add_to_history()

fileio.h:
   readfile() flags
   event_T definition

getchar.h:
   ins_typebuf() flags
   KEYLEN_*

globals.h:
   NO_SCREEN
   NO_BUFFERS
   SEA_* defines
   current_SID flags
   hlf_T enum
   HL_FLAGS
   do_profiling() flags
   schar_T
   sattr_T

indent.h:
   set_indent() flags

macros.h:
   BINARY_FILE_IO flags

mbyte.h:
   MB_BYTE2LEN*
   ENC_*

memfile.h:
   mf_sync() flags

misc1.h:
   open_line() flags

message.h:
   do_dialog() flags
   vim_dialogyesno() flags
   DLG_BUTTON_*

normal.h:
   find_ident_under_cursor() flags

ops.h:
   do_put() flags
   operator ID's

option.h:
   buf_copy_options() flags
   OPT_* flags

os_unix.h:
   mch_nodetype() flags

quickfix.h:
   skip_vimgrep_pat() flags

regexp.h:
   vim_regcomp() flags
   values for reg_do_extmatch

search.h:
   do_search() flags
   search_regcomp() flags
   findmatchlimit() flags

syntax.h:
   HL_* flags
      HL_FOLD is used in buffer_defs.h but nvim
      compiles just fine with the defines in
      syntax.h

tag.h:
   do_tag() flags
   find_tags() flags

term.h:
   TBUFSZ flags
   MOUSE flags

ui.h:
   jump_to_mouse() flags

window.h:
   file_name_in_line() flags
   win_split() flags
   MIN_LINES
   MIN_COLUMNS

Remove VimClipboard which should have been removed with PR #921.

1 files changed, 89 insertions, 0 deletions

diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index ceb0953d14..871674907b 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -18,6 +18,11 @@
  * definition of global variables
  */
 
+/* Values for "starting" */
+#define NO_SCREEN       2       /* no screen updating yet */
+#define NO_BUFFERS      1       /* not all buffers loaded yet */
+/*			0	   not starting anymore */
+
 /*
  * Number of Rows and Columns in the screen.
  * Must be long to be able to use them as options in option.c.
@@ -33,6 +38,12 @@ EXTERN long Rows                        /* nr of rows in the screen */
 EXTERN long Columns INIT(= 80);         /* nr of columns in the screen */
 
 /*
+ * The characters and attributes cached for the screen.
+ */
+typedef char_u schar_T;
+typedef unsigned short sattr_T;
+
+/*
  * The characters that are currently on the screen are kept in ScreenLines[].
  * It is a single block of characters, the size of the screen plus one line.
  * The attributes for those characters are kept in ScreenAttrs[].
@@ -212,6 +223,11 @@ EXTERN int ex_nesting_level INIT(= 0);          /* nesting level */
 EXTERN int debug_break_level INIT(= -1);        /* break below this level */
 EXTERN int debug_did_msg INIT(= FALSE);         /* did "debug mode" message */
 EXTERN int debug_tick INIT(= 0);                /* breakpoint change count */
+
+/* Values for "do_profiling". */
+#define PROF_NONE       0       /* profiling not started */
+#define PROF_YES        1       /* profiling busy */
+#define PROF_PAUSED     2       /* profiling paused */
 EXTERN int do_profiling INIT(= PROF_NONE);      /* PROF_ values */
 
 /*
@@ -297,6 +313,14 @@ EXTERN int may_garbage_collect INIT(= FALSE);
 EXTERN int want_garbage_collect INIT(= FALSE);
 EXTERN int garbage_collect_at_exit INIT(= FALSE);
 
+/* Special values for current_SID. */
+#define SID_MODELINE    -1      /* when using a modeline */
+#define SID_CMDARG      -2      /* for "--cmd" argument */
+#define SID_CARG        -3      /* for "-c" argument */
+#define SID_ENV         -4      /* for sourcing environment variable */
+#define SID_ERROR       -5      /* option was reset because of an error */
+#define SID_NONE        -6      /* don't set scriptID */
+
 /* ID of script being sourced or was sourced to define the current function. */
 EXTERN scid_T current_SID INIT(= 0);
 
@@ -326,6 +350,65 @@ EXTERN int did_check_timestamps INIT(= FALSE);      /* did check timestamps
                                                        recently */
 EXTERN int no_check_timestamps INIT(= 0);       /* Don't check timestamps */
 
+/*
+ * Values for index in highlight_attr[].
+ * When making changes, also update HL_FLAGS below!  And update the default
+ * value of 'highlight' in option.c.
+ */
+typedef enum {
+  HLF_8 = 0         /* Meta & special keys listed with ":map", text that is
+                       displayed different from what it is */
+  , HLF_AT          /* @ and ~ characters at end of screen, characters that
+                       don't really exist in the text */
+  , HLF_D           /* directories in CTRL-D listing */
+  , HLF_E           /* error messages */
+  , HLF_I           /* incremental search */
+  , HLF_L           /* last search string */
+  , HLF_M           /* "--More--" message */
+  , HLF_CM          /* Mode (e.g., "-- INSERT --") */
+  , HLF_N           /* line number for ":number" and ":#" commands */
+  , HLF_CLN         /* current line number */
+  , HLF_R           /* return to continue message and yes/no questions */
+  , HLF_S           /* status lines */
+  , HLF_SNC         /* status lines of not-current windows */
+  , HLF_C           /* column to separate vertically split windows */
+  , HLF_T           /* Titles for output from ":set all", ":autocmd" etc. */
+  , HLF_V           /* Visual mode */
+  , HLF_VNC         /* Visual mode, autoselecting and not clipboard owner */
+  , HLF_W           /* warning messages */
+  , HLF_WM          /* Wildmenu highlight */
+  , HLF_FL          /* Folded line */
+  , HLF_FC          /* Fold column */
+  , HLF_ADD         /* Added diff line */
+  , HLF_CHD         /* Changed diff line */
+  , HLF_DED         /* Deleted diff line */
+  , HLF_TXD         /* Text Changed in diff line */
+  , HLF_CONCEAL     /* Concealed text */
+  , HLF_SC          /* Sign column */
+  , HLF_SPB         /* SpellBad */
+  , HLF_SPC         /* SpellCap */
+  , HLF_SPR         /* SpellRare */
+  , HLF_SPL         /* SpellLocal */
+  , HLF_PNI         /* popup menu normal item */
+  , HLF_PSI         /* popup menu selected item */
+  , HLF_PSB         /* popup menu scrollbar */
+  , HLF_PST         /* popup menu scrollbar thumb */
+  , HLF_TP          /* tabpage line */
+  , HLF_TPS         /* tabpage line selected */
+  , HLF_TPF         /* tabpage line filler */
+  , HLF_CUC         /* 'cursurcolumn' */
+  , HLF_CUL         /* 'cursurline' */
+  , HLF_MC          /* 'colorcolumn' */
+  , HLF_COUNT       /* MUST be the last one */
+} hlf_T;
+
+/* The HL_FLAGS must be in the same order as the HLF_ enums!
+ * When changing this also adjust the default for 'highlight'. */
+#define HL_FLAGS {'8', '@', 'd', 'e', 'i', 'l', 'm', 'M', 'n', 'N', 'r', 's', \
+                  'S', 'c', 't', 'v', 'V', 'w', 'W', 'f', 'F', 'A', 'C', 'D', \
+                  'T', '-', '>', 'B', 'P', 'R', 'L', '+', '=', 'x', 'X', '*', \
+                  '#', '_', '!', '.', 'o'}
+
 EXTERN int highlight_attr[HLF_COUNT];       /* Highl. attr for each context. */
 # define USER_HIGHLIGHT
 #ifdef USER_HIGHLIGHT
@@ -728,6 +811,12 @@ EXTERN int msg_silent INIT(= 0);        /* don't print messages */
 EXTERN int emsg_silent INIT(= 0);       /* don't print error messages */
 EXTERN int cmd_silent INIT(= FALSE);      /* don't echo the command line */
 
+/* Values for swap_exists_action: what to do when swap file already exists */
+#define SEA_NONE        0       /* don't use dialog */
+#define SEA_DIALOG      1       /* use dialog when possible */
+#define SEA_QUIT        2       /* quit editing the file */
+#define SEA_RECOVER     3       /* recover the file */
+
 #define HAS_SWAP_EXISTS_ACTION
 EXTERN int swap_exists_action INIT(= SEA_NONE);
 /* For dialog when swap file already