diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/charset.c | 8 | ||||
| -rw-r--r-- | src/nvim/ex_cmds2.c | 3 | ||||
| -rw-r--r-- | src/nvim/ex_docmd.c | 3 | ||||
| -rw-r--r-- | src/nvim/fileio.c | 2 | ||||
| -rw-r--r-- | src/nvim/message.c | 4 | ||||
| -rw-r--r-- | src/nvim/regexp.c | 3 | ||||
| -rw-r--r-- | src/nvim/search.c | 2 | ||||
| -rw-r--r-- | src/nvim/ui.c | 4 |
8 files changed, 3 insertions, 26 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c index 28463d9705..c37263c040 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -321,11 +321,6 @@ void trans_characters(char_u *buf, int bufsize) } } -#if defined(FEAT_EVAL) \ - || defined(FEAT_TITLE) \ - || defined(FEAT_INS_EXPAND) \ - || defined(PROTO) - /// Translate a string into allocated memory, replacing special chars with /// printable chars. Returns NULL when out of memory. /// @@ -394,9 +389,6 @@ char_u *transstr(char_u *s) return res; } -#endif // if defined(FEAT_EVAL) || defined(FEAT_TITLE) - // || defined(FEAT_INS_EXPAND) || defined(PROTO) - /// Convert the string "str[orglen]" to do ignore-case comparing. Uses the /// current locale. /// diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index b4155b417d..a83b5b3578 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -3228,8 +3228,7 @@ void ex_checktime(exarg_T *eap) no_check_timestamps = save_no_check_timestamps; } -#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \ - && (defined(FEAT_EVAL) || defined(FEAT_MULTI_LANG)) +#if defined(HAVE_LOCALE_H) || defined(X_LOCALE) # define HAVE_GET_LOCALE_VAL static char *get_locale_val(int what); diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 832870cf2d..e532e5e97d 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -4182,8 +4182,6 @@ int ends_excmd(int c) return c == NUL || c == '|' || c == '"' || c == '\n'; } -#if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) || defined(FEAT_EVAL) \ - || defined(PROTO) /* * Return the next command, after the first '|' or '\n'. * Return NULL if not found. @@ -4197,7 +4195,6 @@ char_u *find_nextcmd(char_u *p) } return p + 1; } -#endif /* * Check if *p is a separator between Ex commands. diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index f6c9db350e..6c42a2bef3 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -1493,7 +1493,7 @@ retry: /* Detected a UTF-8 error. */ rewind_retry: /* Retry reading with another conversion. */ -# if defined(FEAT_EVAL) && defined(USE_ICONV) +# ifdef USE_ICONV if (*p_ccv != NUL && iconv_fd != (iconv_t)-1) /* iconv() failed, try 'charconvert' */ did_iconv = TRUE; diff --git a/src/nvim/message.c b/src/nvim/message.c index 9bdcbf6c78..be23ac0450 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -156,7 +156,6 @@ int msg(char_u *s) return msg_attr_keep(s, 0, FALSE); } -#if defined(FEAT_EVAL) || defined(FEAT_GUI_GTK) || defined(PROTO) /* * Like msg() but keep it silent when 'verbosefile' is set. */ @@ -170,7 +169,6 @@ int verb_msg(char_u *s) return n; } -#endif int msg_attr(char_u *s, int attr) { @@ -3054,7 +3052,6 @@ int vim_dialog_yesnoallcancel(int type, char_u *title, char_u *message, int dflt -#if defined(FEAT_EVAL) static char *e_printf = N_("E766: Insufficient arguments for printf()"); static long tv_nr(typval_T *tvs, int *idxp); @@ -3120,7 +3117,6 @@ static double tv_float(typval_T *tvs, int *idxp) } return f; } -#endif /* * This code was included to provide a portable vsnprintf() and snprintf(). diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index de4220f93a..6f2a522801 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -7086,8 +7086,6 @@ vim_regexec ( return rmp->regprog->engine->regexec_nl(rmp, line, col, false); } -#if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) \ - || defined(FIND_REPLACE_DIALOG) || defined(PROTO) /* * Like vim_regexec(), but consider a "\n" in "line" to be a line break. */ @@ -7095,7 +7093,6 @@ int vim_regexec_nl(regmatch_T *rmp, char_u *line, colnr_T col) { return rmp->regprog->engine->regexec_nl(rmp, line, col, true); } -#endif /* * Match a regexp against multiple lines. diff --git a/src/nvim/search.c b/src/nvim/search.c index 56f9355949..b341b4be68 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -449,7 +449,7 @@ void last_pat_prog(regmmatch_T *regmatch) * if (options & SEARCH_PEEK) check for typed char, cancel search * * Return FAIL (zero) for failure, non-zero for success. - * When FEAT_EVAL is defined, returns the index of the first matching + * Returns the index of the first matching * subpattern plus one; one if there was none. */ int searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm) diff --git a/src/nvim/ui.c b/src/nvim/ui.c index 1ef76d516c..e00ee8b8d0 100644 --- a/src/nvim/ui.c +++ b/src/nvim/ui.c @@ -352,16 +352,12 @@ void add_to_input_buf_csi(char_u *str, int len) { #endif -#if defined(FEAT_GUI) || defined(FEAT_EVAL) || defined(FEAT_EX_EXTRA) \ - || defined(PROTO) /* Remove everything from the input buffer. Called when ^C is found */ void trash_input_buf(void) { inbufcount = 0; } -#endif - /* * Read as much data from the input buffer as possible up to maxlen, and store * it in buf. |