Skip to content

Commit 3da7836

Browse files
committed
Remove more #ifdef dead code
1 parent 2d00ead commit 3da7836

File tree

4 files changed

+595
-911
lines changed

4 files changed

+595
-911
lines changed

src/globals.h

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -734,15 +734,12 @@ EXTERN int msg_silent INIT(= 0); /* don't print messages */
734734
EXTERN int emsg_silent INIT(= 0); /* don't print error messages */
735735
EXTERN int cmd_silent INIT(= FALSE); /* don't echo the command line */
736736

737-
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) \
738-
|| defined(FEAT_AUTOCMD)
739-
# define HAS_SWAP_EXISTS_ACTION
737+
#define HAS_SWAP_EXISTS_ACTION
740738
EXTERN int swap_exists_action INIT(= SEA_NONE);
741739
/* For dialog when swap file already
742740
* exists. */
743741
EXTERN int swap_exists_did_quit INIT(= FALSE);
744742
/* Selected "quit" at the dialog. */
745-
#endif
746743

747744
EXTERN char_u *IObuff; /* sprintf's are done in this buffer,
748745
size is IOSIZE */
@@ -906,12 +903,9 @@ EXTERN int lcs_tab2 INIT(= NUL);
906903
EXTERN int lcs_trail INIT(= NUL);
907904
EXTERN int lcs_conceal INIT(= '-');
908905

909-
#if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) \
910-
|| defined(FEAT_FOLDING)
911906
/* Characters from 'fillchars' option */
912907
EXTERN int fill_stl INIT(= ' ');
913908
EXTERN int fill_stlnc INIT(= ' ');
914-
#endif
915909
EXTERN int fill_vert INIT(= ' ');
916910
EXTERN int fill_fold INIT(= '-');
917911
EXTERN int fill_diff INIT(= '-');
@@ -1002,13 +996,8 @@ EXTERN option_table_T printer_opts[OPT_PRINT_NUM_OPTIONS]
1002996
# define PRT_UNIT_POINT 3
1003997
# define PRT_UNIT_NAMES {"pc", "in", "mm", "pt"}
1004998

1005-
#if (defined(FEAT_PRINTER) && defined(FEAT_STL_OPT)) \
1006-
|| defined(FEAT_GUI_TABLINE)
1007999
/* Page number used for %N in 'pageheader' and 'guitablabel'. */
10081000
EXTERN linenr_T printer_page_num;
1009-
#endif
1010-
1011-
10121001

10131002

10141003
EXTERN int typebuf_was_filled INIT(= FALSE); /* received text from client
@@ -1073,10 +1062,6 @@ EXTERN char_u e_while[] INIT(= N_("E588: :endwhile without :while"));
10731062
EXTERN char_u e_for[] INIT(= N_("E588: :endfor without :for"));
10741063
EXTERN char_u e_exists[] INIT(= N_("E13: File exists (add ! to override)"));
10751064
EXTERN char_u e_failed[] INIT(= N_("E472: Command failed"));
1076-
#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(MACOS) \
1077-
|| defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MSWIN)
1078-
EXTERN char_u e_font[] INIT(= N_("E235: Unknown font: %s"));
1079-
#endif
10801065
EXTERN char_u e_internal[] INIT(= N_("E473: Internal error"));
10811066
EXTERN char_u e_interr[] INIT(= N_("Interrupted"));
10821067
EXTERN char_u e_invaddr[] INIT(= N_("E14: Invalid address"));
@@ -1089,17 +1074,6 @@ EXTERN char_u e_isadir2[] INIT(= N_("E17: \"%s\" is a directory"));
10891074
#ifdef FEAT_LIBCALL
10901075
EXTERN char_u e_libcall[] INIT(= N_("E364: Library call failed for \"%s()\""));
10911076
#endif
1092-
#if defined(DYNAMIC_PERL) \
1093-
|| defined(DYNAMIC_PYTHON) || defined(DYNAMIC_PYTHON3) \
1094-
|| defined(DYNAMIC_RUBY) \
1095-
|| defined(DYNAMIC_TCL) \
1096-
|| defined(DYNAMIC_ICONV) \
1097-
|| defined(DYNAMIC_GETTEXT) \
1098-
|| defined(DYNAMIC_MZSCHEME) \
1099-
|| defined(DYNAMIC_LUA)
1100-
EXTERN char_u e_loadlib[] INIT(= N_("E370: Could not load library %s"));
1101-
EXTERN char_u e_loadfunc[] INIT(= N_("E448: Could not load library function %s"));
1102-
#endif
11031077
EXTERN char_u e_markinval[] INIT(= N_("E19: Mark has invalid line number"));
11041078
EXTERN char_u e_marknotset[] INIT(= N_("E20: Mark not set"));
11051079
EXTERN char_u e_modifiable[] INIT(= N_(
@@ -1186,10 +1160,7 @@ EXTERN char_u e_emptybuf[] INIT(= N_("E749: empty buffer"));
11861160
EXTERN char_u e_invalpat[] INIT(= N_(
11871161
"E682: Invalid search pattern or delimiter"));
11881162
EXTERN char_u e_bufloaded[] INIT(= N_("E139: File is loaded in another buffer"));
1189-
#if defined(FEAT_SYN_HL) || \
1190-
(defined(FEAT_INS_EXPAND) && defined(FEAT_COMPL_FUNC))
11911163
EXTERN char_u e_notset[] INIT(= N_("E764: Option '%s' is not set"));
1192-
#endif
11931164
EXTERN char_u e_invalidreg[] INIT(= N_("E850: Invalid register name"));
11941165

11951166

0 commit comments

Comments
 (0)