patch 8.2.4038: various code not used when features are disabled
Problem: Various code not used when features are disabled.
Solution: Add #ifdefs. (Dominique Pellé, closes #9491)
diff --git a/src/alloc.c b/src/alloc.c
index cb781b0..3651a2e 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -151,6 +151,7 @@
return lalloc(size, TRUE);
}
+#if defined(FEAT_QUICKFIX) || defined(PROTO)
/*
* alloc() with an ID for alloc_fail().
*/
@@ -163,6 +164,7 @@
#endif
return lalloc(size, TRUE);
}
+#endif
/*
* Allocate memory and set all bytes to zero.
@@ -178,6 +180,7 @@
return p;
}
+#if defined(FEAT_SIGNS) || defined(PROTO)
/*
* Same as alloc_clear() but with allocation id for testing
*/
@@ -190,6 +193,7 @@
#endif
return alloc_clear(size);
}
+#endif
/*
* Allocate memory like lalloc() and set all bytes to zero.
@@ -648,6 +652,7 @@
ga_clear(gap);
}
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Copy a growing array that contains a list of strings.
*/
@@ -682,6 +687,7 @@
to->ga_len = from->ga_len;
return OK;
}
+#endif
/*
* Initialize a growing array. Don't forget to set ga_itemsize and
diff --git a/src/buffer.c b/src/buffer.c
index c00993a..3445b20 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -138,6 +138,7 @@
return retval;
}
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Ensure buffer "buf" is loaded. Does not trigger the swap-exists action.
*/
@@ -154,6 +155,7 @@
aucmd_restbuf(&aco);
}
}
+#endif
/*
* Open current buffer, that is: open the memfile and read the file into
@@ -5609,6 +5611,7 @@
return buf != NULL && buf->b_p_bt[0] == 'p' && buf->b_p_bt[1] == 'r';
}
+#if defined(FEAT_PROP_POPUP) || defined(PROTO)
/*
* Return TRUE if "buf" is a buffer for a popup window.
*/
@@ -5618,6 +5621,7 @@
return buf != NULL && buf->b_p_bt != NULL
&& buf->b_p_bt[0] == 'p' && buf->b_p_bt[1] == 'o';
}
+#endif
/*
* Return TRUE if "buf" is a "nofile", "acwrite", "terminal" or "prompt"
@@ -5632,6 +5636,7 @@
|| buf->b_p_bt[0] == 'p');
}
+#if defined(FEAT_QUICKFIX) || defined(PROTO)
/*
* Return TRUE if "buf" has 'buftype' set to "nofile".
*/
@@ -5640,6 +5645,7 @@
{
return buf != NULL && buf->b_p_bt[0] == 'n' && buf->b_p_bt[2] == 'f';
}
+#endif
/*
* Return TRUE if "buf" is a "nowrite", "nofile", "terminal" or "prompt"
diff --git a/src/charset.c b/src/charset.c
index d762a25..12d6359 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1476,6 +1476,7 @@
return p;
}
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* skip over ' ', '\t' and '\n'.
*/
@@ -1488,6 +1489,7 @@
++p;
return p;
}
+#endif
/*
* getwhitecols: return the number of whitespace
diff --git a/src/clipboard.c b/src/clipboard.c
index 09d05c9..e2ebd11 100644
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -1540,6 +1540,7 @@
/*
* Property callback to get a timestamp for XtOwnSelection.
*/
+# if (defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)) || defined(PROTO)
static void
clip_x11_timestamp_cb(
Widget w,
@@ -1592,6 +1593,7 @@
XtAddEventHandler(w, PropertyChangeMask, False,
/*(XtEventHandler)*/clip_x11_timestamp_cb, (XtPointer)NULL);
}
+# endif
static void
clip_x11_request_selection_cb(
diff --git a/src/cmdhist.c b/src/cmdhist.c
index 8057344..6256fd9 100644
--- a/src/cmdhist.c
+++ b/src/cmdhist.c
@@ -37,11 +37,13 @@
return history[hist_type];
}
+#if defined(FEAT_VIMINFO) || defined(PROTO)
void
set_histentry(int hist_type, histentry_T *entry)
{
history[hist_type] = entry;
}
+#endif
int *
get_hisidx(int hist_type)
@@ -49,11 +51,13 @@
return &hisidx[hist_type];
}
+#if defined(FEAT_VIMINFO) || defined(PROTO)
int *
get_hisnum(int hist_type)
{
return &hisnum[hist_type];
}
+#endif
/*
* Translate a history character to the associated type number.
diff --git a/src/crypt.c b/src/crypt.c
index 5a83588..85ff33a 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -247,6 +247,7 @@
}
+#if defined(FEAT_SODIUM) || defined(PROTO)
/*
* Get maximum crypt method specific length of the file header in bytes.
*/
@@ -265,6 +266,7 @@
}
return max;
}
+#endif
/*
* Set the crypt method for buffer "buf" to "method_nr" using the int value as
diff --git a/src/edit.c b/src/edit.c
index 4d5ee85..739f078 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1715,6 +1715,7 @@
}
}
+#if defined(FEAT_JOB_CHANNEL) || defined(PROTO)
/*
* Set the insert start position for when using a prompt buffer.
*/
@@ -1728,6 +1729,7 @@
Insstart_blank_vcol = MAXCOL;
arrow_used = FALSE;
}
+#endif
/*
* Undo the previous edit_putchar().
diff --git a/src/eval.c b/src/eval.c
index 7fed286..ec89681 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -654,49 +654,9 @@
}
/*
- * Call Vim script function "func" and return the result as a number.
- * Returns -1 when calling the function fails.
- * Uses argv[0] to argv[argc - 1] for the function arguments. argv[argc] should
- * have type VAR_UNKNOWN.
- */
- varnumber_T
-call_func_retnr(
- char_u *func,
- int argc,
- typval_T *argv)
-{
- typval_T rettv;
- varnumber_T retval;
-
- if (call_vim_function(func, argc, argv, &rettv) == FAIL)
- return -1;
-
- retval = tv_get_number_chk(&rettv, NULL);
- clear_tv(&rettv);
- return retval;
-}
-
-/*
- * Call Vim script function like call_func_retnr() and drop the result.
- * Returns FAIL when calling the function fails.
- */
- int
-call_func_noret(
- char_u *func,
- int argc,
- typval_T *argv)
-{
- typval_T rettv;
-
- if (call_vim_function(func, argc, argv, &rettv) == FAIL)
- return FAIL;
- clear_tv(&rettv);
- return OK;
-}
-
-/*
* Call Vim script function "func" and return the result as a string.
- * Uses "argv" and "argc" as call_func_retnr().
+ * Uses "argv[0]" to "argv[argc - 1]" for the function arguments. "argv[argc]"
+ * should have type VAR_UNKNOWN.
* Returns NULL when calling the function fails.
*/
void *
@@ -718,7 +678,7 @@
/*
* Call Vim script function "func" and return the result as a List.
- * Uses "argv" and "argc" as call_func_retnr().
+ * Uses "argv" and "argc" as call_func_retstr().
* Returns NULL when there is something wrong.
*/
void *
@@ -4783,6 +4743,8 @@
return abort;
}
+#if defined(FEAT_LUA) || defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) \
+ || defined(PROTO)
/*
* Mark a dict and its items with "copyID".
* Returns TRUE if setting references failed somehow.
@@ -4797,6 +4759,7 @@
}
return FALSE;
}
+#endif
/*
* Mark a list and its items with "copyID".
diff --git a/src/evalbuffer.c b/src/evalbuffer.c
index b6bd67b..1b82984 100644
--- a/src/evalbuffer.c
+++ b/src/evalbuffer.c
@@ -864,9 +864,7 @@
}
#endif // FEAT_EVAL
-#if defined(FEAT_JOB_CHANNEL) \
- || defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) \
- || defined(PROTO)
+#if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) || defined(PROTO)
/*
* Make "buf" the current buffer. restore_buffer() MUST be called to undo.
* No autocommands will be executed. Use aucmd_prepbuf() if there are any.
diff --git a/src/evalfunc.c b/src/evalfunc.c
index fc2fd07..bb50d55 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3529,6 +3529,7 @@
}
}
+#if defined(FEAT_LUA) || defined(PROTO)
/*
* Get next line from a string containing NL separated lines.
* Called by do_cmdline() to get the next line.
@@ -3570,6 +3571,7 @@
do_cmdline(NULL, get_str_line, (void *)&str,
DOCMD_NOWAIT|DOCMD_VERBOSE|DOCMD_REPEAT|DOCMD_KEYTYPED);
}
+#endif
/*
* Get next line from a list.
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index ea6dbb6..be95992 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3082,6 +3082,7 @@
return OK;
}
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Return TRUE if "cmod" has anything set.
*/
@@ -3110,6 +3111,7 @@
}
return FALSE;
}
+#endif
/*
* Apply the command modifiers. Saves current state in "cmdmod", call
@@ -3393,6 +3395,7 @@
*d = NUL;
}
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* If "start" points "&opt", "&l:opt", "&g:opt" or "$ENV" return a pointer to
* the name. Otherwise just return "start".
@@ -3413,6 +3416,7 @@
name += 1;
return name;
}
+#endif
/*
* Find an Ex command by its name, either built-in or user.
diff --git a/src/globals.h b/src/globals.h
index b258aec..f04b29e 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -440,7 +440,9 @@
#endif
+#ifdef FEAT_EVAL
EXTERN int did_source_packages INIT(= FALSE);
+#endif
// Magic number used for hashitem "hi_key" value indicating a deleted item.
// Only the address is used.
@@ -1153,7 +1155,9 @@
EXTERN cmdmod_T cmdmod; // Ex command modifiers
+#ifdef FEAT_EVAL
EXTERN int is_export INIT(= FALSE); // :export {cmd}
+#endif
EXTERN int msg_silent INIT(= 0); // don't print messages
EXTERN int emsg_silent INIT(= 0); // don't print error messages
@@ -1190,7 +1194,9 @@
#endif
;
EXTERN int ex_normal_busy INIT(= 0); // recursiveness of ex_normal()
+#ifdef FEAT_EVAL
EXTERN int in_feedkeys INIT(= 0); // ex_normal_busy set in feedkeys()
+#endif
EXTERN int ex_normal_lock INIT(= 0); // forbid use of ex_normal()
#ifdef FEAT_EVAL
@@ -1394,8 +1400,10 @@
EXTERN long sub_nsubs; // total number of substitutions
EXTERN linenr_T sub_nlines; // total number of lines changed
+#ifdef FEAT_EVAL
// Used when a compiled :substitute has an expression.
EXTERN struct subs_expr_S *substitute_instr INIT(= NULL);
+#endif
// table to store parsed 'wildmode'
EXTERN char_u wim_flags[4];
@@ -1588,7 +1596,9 @@
EXTERN char top_bot_msg[] INIT(= N_("search hit TOP, continuing at BOTTOM"));
EXTERN char bot_top_msg[] INIT(= N_("search hit BOTTOM, continuing at TOP"));
+#ifdef FEAT_EVAL
EXTERN char line_msg[] INIT(= N_(" line "));
+#endif
#ifdef FEAT_CRYPT
EXTERN char need_key_msg[] INIT(= N_("Need encryption key for \"%s\""));
diff --git a/src/gui_xim.c b/src/gui_xim.c
index 28d354c..1dfb105 100644
--- a/src/gui_xim.c
+++ b/src/gui_xim.c
@@ -125,6 +125,7 @@
}
#endif
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Mark the global 'imactivatefunc' and 'imstatusfunc' callbacks with 'copyID'
* so that they are not garbage collected.
@@ -134,14 +135,14 @@
{
int abort = FALSE;
-#if defined(FEAT_EVAL) && \
- (defined(FEAT_XIM) || defined(IME_WITHOUT_XIM) || defined(VIMDLL))
+# if defined(FEAT_XIM) || defined(IME_WITHOUT_XIM) || defined(VIMDLL)
abort = set_ref_in_callback(&imaf_cb, copyID);
abort = abort || set_ref_in_callback(&imsf_cb, copyID);
-#endif
+# endif
return abort;
}
+#endif
#if defined(FEAT_XIM) || defined(PROTO)
diff --git a/src/hashtab.c b/src/hashtab.c
index dc0cbb6..482d830 100644
--- a/src/hashtab.c
+++ b/src/hashtab.c
@@ -288,6 +288,7 @@
++ht->ht_locked;
}
+#if defined(FEAT_PROP_POPUP) || defined(PROTO)
/*
* Lock a hashtable at the specified number of entries.
* Caller must make sure no more than "size" entries will be added.
@@ -299,6 +300,7 @@
(void)hash_may_resize(ht, size);
++ht->ht_locked;
}
+#endif
/*
* Unlock a hashtable: allow ht_array changes again.
diff --git a/src/highlight.c b/src/highlight.c
index fa32981..efbc5b1 100644
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -343,6 +343,7 @@
NULL
};
+#if defined(FEAT_SYN_HL) || defined(PROTO)
/*
* Returns the number of highlight groups.
*/
@@ -369,6 +370,7 @@
{
return HL_TABLE()[id].sg_link;
}
+#endif
void
init_highlight(
diff --git a/src/insexpand.c b/src/insexpand.c
index 8fcce7f..51177fb 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -263,7 +263,9 @@
/*
* Functions to check the current CTRL-X mode.
*/
+#ifdef FEAT_CINDENT
int ctrl_x_mode_none(void) { return ctrl_x_mode == 0; }
+#endif
int ctrl_x_mode_normal(void) { return ctrl_x_mode == CTRL_X_NORMAL; }
int ctrl_x_mode_scroll(void) { return ctrl_x_mode == CTRL_X_SCROLL; }
int ctrl_x_mode_whole_line(void) { return ctrl_x_mode == CTRL_X_WHOLE_LINE; }
diff --git a/src/main.c b/src/main.c
index dc82a8a..5723d46 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1091,12 +1091,15 @@
was_safe = FALSE;
}
+#if defined(FEAT_EVAL) || defined(MESSAGE_QUEUE) || defined(PROTO)
int
get_was_safe_state(void)
{
return was_safe;
}
+#endif
+#if defined(MESSAGE_QUEUE) || defined(PROTO)
/*
* Invoked when leaving code that invokes callbacks. Then trigger
* SafeStateAgain, if it was safe when starting to wait for a character.
@@ -1137,6 +1140,7 @@
"SafeState: back to waiting, not triggering SafeStateAgain");
#endif
}
+#endif
/*
diff --git a/src/mark.c b/src/mark.c
index 771eb1b..4765b79 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -1368,6 +1368,7 @@
}
#endif
+#if defined(FEAT_VIMINFO) || defined(PROTO)
/*
* Return a pointer to the named file marks.
*/
@@ -1376,6 +1377,7 @@
{
return namedfm;
}
+#endif
#if defined(FEAT_EVAL) || defined(PROTO)
/*
diff --git a/src/message.c b/src/message.c
index 81c0f47..17c541f 100644
--- a/src/message.c
+++ b/src/message.c
@@ -876,6 +876,7 @@
siemsg(_(e_internal_error_str), where);
}
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Like internal_error() but do not call abort(), to avoid tests using
* test_unknown() and test_void() causing Vim to exit.
@@ -885,6 +886,7 @@
{
semsg(_(e_internal_error_str), where);
}
+#endif
// emsg3() and emsgn() are in misc2.c to avoid warnings for the prototypes.
@@ -894,6 +896,7 @@
semsg(_(e_invalid_register_name_str), transchar(name));
}
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Give an error message which contains %s for "name[len]".
*/
@@ -905,6 +908,7 @@
semsg(msg, copy == NULL ? "NULL" : (char *)copy);
vim_free(copy);
}
+#endif
/*
* Like msg(), but truncate to a single line if p_shm contains 't', or when
diff --git a/src/misc1.c b/src/misc1.c
index 31cc63b..e43d001 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -1896,7 +1896,6 @@
vim_setenv(var, (char_u *)"");
#endif
}
-#endif
/*
@@ -1914,6 +1913,7 @@
&& STRICMP(name, "VIMRUNTIME") == 0)
didset_vimruntime = FALSE;
}
+#endif
/*
* Our portable version of setenv.
@@ -2230,6 +2230,7 @@
}
}
+# if defined(FEAT_SPELL) || defined(PROTO)
/*
* Like line_breakcheck() but check 100 times less often.
*/
@@ -2242,6 +2243,7 @@
ui_breakcheck();
}
}
+#endif
#if defined(VIM_BACKTICK) || defined(FEAT_EVAL) \
|| (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
diff --git a/src/misc2.c b/src/misc2.c
index 6a65ec4..aa39822 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -2424,6 +2424,7 @@
return OK;
}
+#if defined(EXITFREE) || defined(PROTOS)
/*
* Free the memory allocated by get_user_name()
*/
@@ -2432,6 +2433,7 @@
{
vim_free(username);
}
+#endif
#ifndef HAVE_QSORT
/*
diff --git a/src/ops.c b/src/ops.c
index 44a6a6e..8b0f79c 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3350,6 +3350,7 @@
}
#endif
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Mark the global 'operatorfunc' callback with 'copyID' so that it is not
* garbage collected.
@@ -3359,12 +3360,11 @@
{
int abort = FALSE;
-#ifdef FEAT_EVAL
abort = set_ref_in_callback(&opfunc_cb, copyID);
-#endif
return abort;
}
+#endif
/*
* Handle the "g@" operator: call 'operatorfunc'.
diff --git a/src/option.c b/src/option.c
index dd51593..169f929 100644
--- a/src/option.c
+++ b/src/option.c
@@ -753,6 +753,7 @@
options[opt_idx].def_val[VI_DEFAULT] = (char_u *)(long_i)val;
}
+#if defined(FEAT_PROP_POPUP) || defined(PROTO)
/*
* Set all window-local and buffer-local options to the Vim default.
* local-global options will use the global value.
@@ -784,6 +785,7 @@
curwin = save_curwin;
curbuf = curwin->w_buffer;
}
+#endif
#if defined(EXITFREE) || defined(PROTO)
/*
@@ -5535,6 +5537,7 @@
return options[opt_idx].var;
}
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Return the full name of the option at 'opt_idx'
*/
@@ -5543,6 +5546,7 @@
{
return (char_u *)options[opt_idx].fullname;
}
+#endif
/*
* Get the value of 'equalprg', either the buffer-local one or the global one.
diff --git a/src/option.h b/src/option.h
index a82258e..00a2d2e 100644
--- a/src/option.h
+++ b/src/option.h
@@ -486,7 +486,9 @@
EXTERN char_u *p_ccv; // 'charconvert'
#endif
EXTERN int p_cdh; // 'cdhome'
+#ifdef FEAT_CINDENT
EXTERN char_u *p_cino; // 'cinoptions'
+#endif
#ifdef FEAT_CMDWIN
EXTERN char_u *p_cedit; // 'cedit'
EXTERN long p_cwh; // 'cmdwinheight'
@@ -730,13 +732,6 @@
EXTERN char_u *p_mp; // 'makeprg'
#endif
EXTERN char_u *p_mps; // 'matchpairs'
-#ifdef FEAT_SIGNS
-EXTERN char_u *p_scl; // signcolumn
-#endif
-#ifdef FEAT_SYN_HL
-EXTERN char_u *p_cc; // 'colorcolumn'
-EXTERN int p_cc_cols[256]; // array for 'colorcolumn' columns
-#endif
EXTERN long p_mat; // 'matchtime'
EXTERN long p_mco; // 'maxcombine'
#ifdef FEAT_EVAL
@@ -840,7 +835,9 @@
EXTERN char_u *p_ruf; // 'rulerformat'
#endif
EXTERN char_u *p_pp; // 'packpath'
+#ifdef FEAT_QUICKFIX
EXTERN char_u *p_qftf; // 'quickfixtextfunc'
+#endif
EXTERN char_u *p_rtp; // 'runtimepath'
EXTERN long p_sj; // 'scrolljump'
#if defined(MSWIN) && defined(FEAT_GUI)
@@ -949,7 +946,9 @@
#define SWB_NEWTAB 0x008
#define SWB_VSPLIT 0x010
#define SWB_USELAST 0x020
+#ifdef FEAT_SYN_HL
EXTERN char_u *p_syn; // 'syntax'
+#endif
EXTERN long p_ts; // 'tabstop'
EXTERN int p_tbs; // 'tagbsearch'
EXTERN char_u *p_tc; // 'tagcase'
@@ -1026,8 +1025,8 @@
# define TTYM_URXVT 0x40
# define TTYM_SGR 0x80
#endif
-EXTERN char_u *p_udir; // 'undodir'
#ifdef FEAT_PERSISTENT_UNDO
+EXTERN char_u *p_udir; // 'undodir'
EXTERN int p_udf; // 'undofile'
#endif
EXTERN long p_ul; // 'undolevels'
diff --git a/src/optionstr.c b/src/optionstr.c
index 6cc4cf5..94a1e2a 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -454,6 +454,7 @@
unblock_autocmds();
}
+#if defined(FEAT_PROP_POPUP) || defined(PROTO)
/*
* Like set_string_option_direct(), but for a buffer-local option in "buf".
* Blocks autocommands to avoid the old curbuf becoming invalid.
@@ -477,6 +478,7 @@
curwin->w_buffer = curbuf;
unblock_autocmds();
}
+#endif
/*
* Set a string option to a new value, and handle the effects.
diff --git a/src/register.c b/src/register.c
index d61a5d0..08a73fe 100644
--- a/src/register.c
+++ b/src/register.c
@@ -38,41 +38,53 @@
#endif
static void dis_msg(char_u *p, int skip_esc);
+#if defined(FEAT_VIMINFO) || defined(PROTO)
yankreg_T *
get_y_regs(void)
{
return y_regs;
}
+#endif
+#if defined(FEAT_CLIPBOARD) || defined(PROTO)
yankreg_T *
get_y_register(int reg)
{
return &y_regs[reg];
}
+#endif
+#if defined(FEAT_CLIPBOARD) || defined(FEAT_VIMINFO) || defined(FEAT_EVAL) || defined(PROTO)
yankreg_T *
get_y_current(void)
{
return y_current;
}
+#endif
+#if defined(FEAT_CLIPBOARD) || defined(FEAT_VIMINFO) || defined(PROTO)
yankreg_T *
get_y_previous(void)
{
return y_previous;
}
+#endif
+#if defined(FEAT_CLIPBOARD) || defined(PROTO)
void
set_y_current(yankreg_T *yreg)
{
y_current = yreg;
}
+#endif
+#if defined(FEAT_CLIPBOARD) || defined(FEAT_VIMINFO) || defined(PROTO)
void
set_y_previous(yankreg_T *yreg)
{
y_previous = yreg;
}
+#endif
void
reset_y_append(void)
@@ -474,6 +486,7 @@
*/
static int execreg_lastc = NUL;
+#if defined(FEAT_VIMINFO) || defined(PROTO)
int
get_execreg_lastc(void)
{
@@ -485,6 +498,7 @@
{
execreg_lastc = lastc;
}
+#endif
/*
* When executing a register as a series of ex-commands, if the
@@ -2308,6 +2322,7 @@
}
}
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Return the index of the register "" points to.
*/
@@ -2316,6 +2331,7 @@
{
return y_previous == NULL ? -1 : y_previous - &y_regs[0];
}
+#endif
/*
* ":dis" and ":registers": Display the contents of the yank registers.
diff --git a/src/scriptfile.c b/src/scriptfile.c
index 4256b39..8fb3cae 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1635,8 +1635,6 @@
}
# endif
-#endif
-
linenr_T
get_sourced_lnum(
char_u *(*fgetline)(int, void *, int, getline_opt_T),
@@ -1646,6 +1644,7 @@
? ((source_cookie_T *)cookie)->sourcing_lnum
: SOURCING_LNUM;
}
+#endif
static char_u *
get_one_sourceline(source_cookie_T *sp)
diff --git a/src/tag.c b/src/tag.c
index c12c5fa..bf816e1 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -102,6 +102,7 @@
// Used instead of NUL to separate tag fields in the growarrays.
#define TAG_SEP 0x02
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Reads the 'tagfunc' option value and convert that to a callback value.
* Invoked when the 'tagfunc' option is set. The option value can be a name of
@@ -125,8 +126,9 @@
return OK;
}
+#endif
-#if defined(EXITFREE) || defined(PROTO)
+# if defined(EXITFREE) || defined(PROTO)
void
free_tagfunc_option(void)
{
@@ -134,8 +136,9 @@
free_callback(&tfu_cb);
# endif
}
-#endif
+# endif
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Mark the global 'tagfunc' callback with 'copyID' so that it is not garbage
* collected.
@@ -145,9 +148,7 @@
{
int abort = FALSE;
-#ifdef FEAT_EVAL
abort = set_ref_in_callback(&tfu_cb, copyID);
-#endif
return abort;
}
@@ -159,12 +160,11 @@
void
set_buflocal_tfu_callback(buf_T *buf UNUSED)
{
-#ifdef FEAT_EVAL
free_callback(&buf->b_tfu_cb);
if (tfu_cb.cb_name != NULL && *tfu_cb.cb_name != NUL)
copy_callback(&buf->b_tfu_cb, &tfu_cb);
-#endif
}
+#endif
/*
* Jump to tag; handling of tag commands and tag stack
diff --git a/src/term.c b/src/term.c
index 853d93f..0090fb7 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3991,6 +3991,7 @@
}
}
+#ifdef FEAT_GUI
/*
* Check whether the cursor is invisible due to an ongoing cursor-less sleep
*/
@@ -3999,6 +4000,7 @@
{
return cursor_is_asleep;
}
+#endif
/*
* Disable the cursor and mark it disabled by cursor-less sleep
diff --git a/src/typval.c b/src/typval.c
index 23ce712..eb0ef77 100644
--- a/src/typval.c
+++ b/src/typval.c
@@ -528,6 +528,7 @@
|| check_for_dict_arg(args, idx) != FAIL);
}
+#if defined(FEAT_JOB_CHANNEL) || defined(PROTO)
/*
* Give an error and return FAIL unless "args[idx]" is a channel or a job.
*/
@@ -576,6 +577,7 @@
return (args[idx].v_type == VAR_UNKNOWN
|| check_for_job_arg(args, idx) != FAIL);
}
+#endif
/*
* Give an error and return FAIL unless "args[idx]" is a string or
@@ -642,6 +644,7 @@
|| check_for_lnum_arg(args, idx));
}
+#if defined(FEAT_JOB_CHANNEL) || defined(PROTO)
/*
* Give an error and return FAIL unless "args[idx]" is a string or a blob.
*/
@@ -655,6 +658,7 @@
}
return OK;
}
+#endif
/*
* Give an error and return FAIL unless "args[idx]" is a string or a list.
diff --git a/src/usercmd.c b/src/usercmd.c
index 135752d..de985f8 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -319,6 +319,7 @@
return NULL;
}
+#ifdef FEAT_EVAL
/*
* Get the name of user command "idx". "cmdidx" can be CMD_USER or
* CMD_USER_BUF.
@@ -343,6 +344,7 @@
}
return NULL;
}
+#endif
/*
* Function given to ExpandGeneric() to obtain the list of user address type
@@ -394,6 +396,7 @@
return (char_u *)command_complete[idx].name;
}
+#ifdef FEAT_EVAL
int
cmdcomplete_str_to_type(char_u *complete_str)
{
@@ -405,6 +408,7 @@
return EXPAND_NOTHING;
}
+#endif
/*
* List user commands starting with "name[name_len]".
diff --git a/src/userfunc.c b/src/userfunc.c
index 6821569..3617e7b 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -39,6 +39,7 @@
hash_init(&func_hashtab);
}
+#if defined(FEAT_PROFILE) || defined(PROTO)
/*
* Return the function hash table
*/
@@ -47,6 +48,7 @@
{
return &func_hashtab;
}
+#endif
/*
* Get one function argument.
diff --git a/src/version.c b/src/version.c
index 9d568b6..c4d639e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4038,
+/**/
4037,
/**/
4036,
diff --git a/src/vim9script.c b/src/vim9script.c
index 4d16a2a..e5e2695 100644
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -115,6 +115,7 @@
#endif
}
+#if defined(FEAT_EVAL) || defined(PROTO)
/*
* When in Vim9 script give an error and return FAIL.
*/
@@ -159,6 +160,7 @@
}
return FALSE;
}
+#endif
/*
* Return TRUE if "p" points at a "#" not followed by one '{'.
diff --git a/src/vim9type.c b/src/vim9type.c
index 6671f5e..bf82b7d 100644
--- a/src/vim9type.c
+++ b/src/vim9type.c
@@ -532,12 +532,6 @@
}
void
-type_mismatch(type_T *expected, type_T *actual)
-{
- arg_type_mismatch(expected, actual, 0);
-}
-
- void
arg_type_mismatch(type_T *expected, type_T *actual, int arg_idx)
{
where_T where = WHERE_INIT;