Remove FEAT_EVAL

Support for VimScript, :let, :if, etc.
This commit is contained in:
Hinidu
2014-04-11 23:58:31 +03:00
committed by Justin M. Keyes
parent 5f2ccb94d2
commit a29b94e2f9
9 changed files with 3 additions and 27 deletions

View File

@@ -107,7 +107,6 @@
#define FEAT_CONCEAL #define FEAT_CONCEAL
#define FEAT_CSCOPE #define FEAT_CSCOPE
#define FEAT_DIGRAPHS #define FEAT_DIGRAPHS
#define FEAT_EVAL
#define FEAT_EX_EXTRA #define FEAT_EX_EXTRA
#define FEAT_FIND_ID #define FEAT_FIND_ID
#define FEAT_FKMAP #define FEAT_FKMAP

View File

@@ -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 /// Translate a string into allocated memory, replacing special chars with
/// printable chars. Returns NULL when out of memory. /// printable chars. Returns NULL when out of memory.
/// ///
@@ -394,9 +389,6 @@ char_u *transstr(char_u *s)
return res; 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 /// Convert the string "str[orglen]" to do ignore-case comparing. Uses the
/// current locale. /// current locale.
/// ///

View File

@@ -3228,8 +3228,7 @@ void ex_checktime(exarg_T *eap)
no_check_timestamps = save_no_check_timestamps; no_check_timestamps = save_no_check_timestamps;
} }
#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \ #if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
&& (defined(FEAT_EVAL) || defined(FEAT_MULTI_LANG))
# define HAVE_GET_LOCALE_VAL # define HAVE_GET_LOCALE_VAL
static char *get_locale_val(int what); static char *get_locale_val(int what);

View File

@@ -4182,8 +4182,6 @@ int ends_excmd(int c)
return c == NUL || c == '|' || c == '"' || c == '\n'; 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 the next command, after the first '|' or '\n'.
* Return NULL if not found. * Return NULL if not found.
@@ -4197,7 +4195,6 @@ char_u *find_nextcmd(char_u *p)
} }
return p + 1; return p + 1;
} }
#endif
/* /*
* Check if *p is a separator between Ex commands. * Check if *p is a separator between Ex commands.

View File

@@ -1493,7 +1493,7 @@ retry:
/* Detected a UTF-8 error. */ /* Detected a UTF-8 error. */
rewind_retry: rewind_retry:
/* Retry reading with another conversion. */ /* Retry reading with another conversion. */
# if defined(FEAT_EVAL) && defined(USE_ICONV) # ifdef USE_ICONV
if (*p_ccv != NUL && iconv_fd != (iconv_t)-1) if (*p_ccv != NUL && iconv_fd != (iconv_t)-1)
/* iconv() failed, try 'charconvert' */ /* iconv() failed, try 'charconvert' */
did_iconv = TRUE; did_iconv = TRUE;

View File

@@ -156,7 +156,6 @@ int msg(char_u *s)
return msg_attr_keep(s, 0, FALSE); 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. * Like msg() but keep it silent when 'verbosefile' is set.
*/ */
@@ -170,7 +169,6 @@ int verb_msg(char_u *s)
return n; return n;
} }
#endif
int msg_attr(char_u *s, int attr) 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 char *e_printf = N_("E766: Insufficient arguments for printf()");
static long tv_nr(typval_T *tvs, int *idxp); static long tv_nr(typval_T *tvs, int *idxp);
@@ -3120,7 +3117,6 @@ static double tv_float(typval_T *tvs, int *idxp)
} }
return f; return f;
} }
#endif
/* /*
* This code was included to provide a portable vsnprintf() and snprintf(). * This code was included to provide a portable vsnprintf() and snprintf().

View File

@@ -7086,8 +7086,6 @@ vim_regexec (
return rmp->regprog->engine->regexec_nl(rmp, line, col, false); 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. * 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); return rmp->regprog->engine->regexec_nl(rmp, line, col, true);
} }
#endif
/* /*
* Match a regexp against multiple lines. * Match a regexp against multiple lines.

View File

@@ -449,7 +449,7 @@ void last_pat_prog(regmmatch_T *regmatch)
* if (options & SEARCH_PEEK) check for typed char, cancel search * if (options & SEARCH_PEEK) check for typed char, cancel search
* *
* Return FAIL (zero) for failure, non-zero for success. * 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. * subpattern plus one; one if there was none.
*/ */
int searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm) int searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)

View File

@@ -352,16 +352,12 @@ void add_to_input_buf_csi(char_u *str, int len) {
#endif #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 */ /* Remove everything from the input buffer. Called when ^C is found */
void trash_input_buf(void) void trash_input_buf(void)
{ {
inbufcount = 0; inbufcount = 0;
} }
#endif
/* /*
* Read as much data from the input buffer as possible up to maxlen, and store * Read as much data from the input buffer as possible up to maxlen, and store
* it in buf. * it in buf.