diff options
author | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2014-03-13 02:40:51 -0300 |
---|---|---|
committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-03-18 20:19:19 -0300 |
commit | 59f2430a8d543fc57a31d489a649ec87a6ca9715 (patch) | |
tree | 69d4e89c8f37efc3b5e20ab05e70a9eb4e4c1c05 /src/globals.h | |
parent | 1fcd332e8e3d2c6c22fa548cc96b1d9dde2f5651 (diff) | |
download | rneovim-59f2430a8d543fc57a31d489a649ec87a6ca9715.tar.gz rneovim-59f2430a8d543fc57a31d489a649ec87a6ca9715.tar.bz2 rneovim-59f2430a8d543fc57a31d489a649ec87a6ca9715.zip |
Delete structs.h by spliting it and moving code to other headers
Here's the list of squashed commits (for more info, see PR #378).
- Define guicolor_T as a typedef in syntax.h
- Move a big chunk of code from structs.h to buffer_defs.h
- Move aco_save_T from structs.h to fileio.h
- Move option_table_T from structs.h to hardcopy.h
Aditionally:
- Move the printer_opts global to hardcopy.c
- Delete structs.h. Include buffer_defs.h where structs.h was included
before.
- Add header guards to option_defs.h
- Put mark types and constants in new mark_defs.h
- Move undo structs to undo_defs.h
- Move memfile structs to new memfile_defs.h
- Move expand_T and cmdmod_T to ex_cmds_defs.h
- Move memline_T to memline_defs.h
- Move many defs and types to ex_eval.h
- Move syntax related types to syntax_defs.h
- Move struct memfile to memfile_defs.h
- struct buffblock and struct buffheader moved back to buffer_defs.h
- Move some datatypes to hashtab.h and eval_defs.h
- Move the buffer_defs.h include and TODOs for remaining unrelated types in buffer_defs.h
Diffstat (limited to 'src/globals.h')
-rw-r--r-- | src/globals.h | 53 |
1 files changed, 1 insertions, 52 deletions
diff --git a/src/globals.h b/src/globals.h index 9d61735c85..f6adf0381c 100644 --- a/src/globals.h +++ b/src/globals.h @@ -9,6 +9,7 @@ #ifndef NEOVIM_GLOBALS_H #define NEOVIM_GLOBALS_H +#include "ex_eval.h" #include "mbyte.h" #include "menu.h" @@ -938,58 +939,6 @@ EXTERN int stl_syntax INIT(= 0); /* don't use 'hlsearch' temporarily */ EXTERN int no_hlsearch INIT(= FALSE); - -/* - * Printer stuff shared between hardcopy.c and machine-specific printing code. - */ -# define OPT_PRINT_TOP 0 -# define OPT_PRINT_BOT 1 -# define OPT_PRINT_LEFT 2 -# define OPT_PRINT_RIGHT 3 -# define OPT_PRINT_HEADERHEIGHT 4 -# define OPT_PRINT_SYNTAX 5 -# define OPT_PRINT_NUMBER 6 -# define OPT_PRINT_WRAP 7 -# define OPT_PRINT_DUPLEX 8 -# define OPT_PRINT_PORTRAIT 9 -# define OPT_PRINT_PAPER 10 -# define OPT_PRINT_COLLATE 11 -# define OPT_PRINT_JOBSPLIT 12 -# define OPT_PRINT_FORMFEED 13 - -# define OPT_PRINT_NUM_OPTIONS 14 - -EXTERN option_table_T printer_opts[OPT_PRINT_NUM_OPTIONS] -# ifdef DO_INIT - = - { - {"top", TRUE, 0, NULL, 0, FALSE}, - {"bottom", TRUE, 0, NULL, 0, FALSE}, - {"left", TRUE, 0, NULL, 0, FALSE}, - {"right", TRUE, 0, NULL, 0, FALSE}, - {"header", TRUE, 0, NULL, 0, FALSE}, - {"syntax", FALSE, 0, NULL, 0, FALSE}, - {"number", FALSE, 0, NULL, 0, FALSE}, - {"wrap", FALSE, 0, NULL, 0, FALSE}, - {"duplex", FALSE, 0, NULL, 0, FALSE}, - {"portrait", FALSE, 0, NULL, 0, FALSE}, - {"paper", FALSE, 0, NULL, 0, FALSE}, - {"collate", FALSE, 0, NULL, 0, FALSE}, - {"jobsplit", FALSE, 0, NULL, 0, FALSE}, - {"formfeed", FALSE, 0, NULL, 0, FALSE}, - } - -# endif -; - -/* For prt_get_unit(). */ -# define PRT_UNIT_NONE -1 -# define PRT_UNIT_PERC 0 -# define PRT_UNIT_INCH 1 -# define PRT_UNIT_MM 2 -# define PRT_UNIT_POINT 3 -# define PRT_UNIT_NAMES {"pc", "in", "mm", "pt"} - /* Page number used for %N in 'pageheader' and 'guitablabel'. */ EXTERN linenr_T printer_page_num; |