patch 8.1.0809: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_MBYTE, part 3.
diff --git a/src/quickfix.c b/src/quickfix.c
index bc09053..8b6c223 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -804,7 +804,6 @@
else
state->linebuf = IObuff;
-#ifdef FEAT_MBYTE
// Convert a line if it contains a non-ASCII character.
if (state->vc.vc_type != CONV_NONE && has_non_ascii(state->linebuf))
{
@@ -827,7 +826,6 @@
}
}
}
-#endif
return QF_OK;
}
@@ -872,9 +870,7 @@
#endif
}
-#ifdef FEAT_MBYTE
remove_bom(state->linebuf);
-#endif
return QF_OK;
}
@@ -1538,11 +1534,9 @@
linenr_T lnumfirst,
linenr_T lnumlast)
{
-#ifdef FEAT_MBYTE
pstate->vc.vc_type = CONV_NONE;
if (enc != NULL && *enc != NUL)
convert_setup(&pstate->vc, enc, p_enc);
-#endif
if (efile != NULL && (pstate->fd = mch_fopen((char *)efile, "r")) == NULL)
{
@@ -1576,10 +1570,8 @@
fclose(pstate->fd);
vim_free(pstate->growbuf);
-#ifdef FEAT_MBYTE
if (pstate->vc.vc_type != CONV_NONE)
convert_setup(&pstate->vc, NULL, NULL);
-#endif
}
/*
@@ -4690,9 +4682,7 @@
return;
#endif
}
-#ifdef FEAT_MBYTE
enc = (*curbuf->b_p_menc != NUL) ? curbuf->b_p_menc : p_menc;
-#endif
if (is_loclist_cmd(eap->cmdidx))
wp = curwin;
@@ -5032,9 +5022,7 @@
}
if (au_name != NULL)
apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name, NULL, FALSE, curbuf);
-#ifdef FEAT_MBYTE
enc = (*curbuf->b_p_menc != NUL) ? curbuf->b_p_menc : p_menc;
-#endif
#ifdef FEAT_BROWSE
if (cmdmod.browse)
{
@@ -7035,9 +7023,7 @@
hgr_search_file(
qf_info_T *qi,
char_u *fname,
-#ifdef FEAT_MBYTE
vimconv_T *p_vc,
-#endif
regmatch_T *p_regmatch)
{
FILE *fd;
@@ -7051,7 +7037,7 @@
while (!vim_fgets(IObuff, IOSIZE, fd) && !got_int)
{
char_u *line = IObuff;
-#ifdef FEAT_MBYTE
+
// Convert a line if 'encoding' is not utf-8 and
// the line contains a non-ASCII character.
if (p_vc->vc_type != CONV_NONE
@@ -7061,7 +7047,6 @@
if (line == NULL)
line = IObuff;
}
-#endif
if (vim_regexec(p_regmatch, line, (colnr_T)0))
{
@@ -7089,17 +7074,13 @@
) == FAIL)
{
got_int = TRUE;
-#ifdef FEAT_MBYTE
if (line != IObuff)
vim_free(line);
-#endif
break;
}
}
-#ifdef FEAT_MBYTE
if (line != IObuff)
vim_free(line);
-#endif
++lnum;
line_breakcheck();
}
@@ -7114,10 +7095,8 @@
hgr_search_files_in_dir(
qf_info_T *qi,
char_u *dirname,
- regmatch_T *p_regmatch
-#ifdef FEAT_MBYTE
- , vimconv_T *p_vc
-#endif
+ regmatch_T *p_regmatch,
+ vimconv_T *p_vc
#ifdef FEAT_MULTI_LANG
, char_u *lang
#endif
@@ -7147,11 +7126,7 @@
continue;
#endif
- hgr_search_file(qi, fnames[fi],
-#ifdef FEAT_MBYTE
- p_vc,
-#endif
- p_regmatch);
+ hgr_search_file(qi, fnames[fi], p_vc, p_regmatch);
}
FreeWild(fcount, fnames);
}
@@ -7168,7 +7143,6 @@
{
char_u *p;
-#ifdef FEAT_MBYTE
vimconv_T vc;
// Help files are in utf-8 or latin1, convert lines when 'encoding'
@@ -7176,7 +7150,6 @@
vc.vc_type = CONV_NONE;
if (!enc_utf8)
convert_setup(&vc, (char_u *)"utf-8", p_enc);
-#endif
// Go through all the directories in 'runtimepath'
p = p_rtp;
@@ -7184,20 +7157,15 @@
{
copy_option_part(&p, NameBuff, MAXPATHL, ",");
- hgr_search_files_in_dir(qi, NameBuff, p_regmatch
-#ifdef FEAT_MBYTE
- , &vc
-#endif
+ hgr_search_files_in_dir(qi, NameBuff, p_regmatch, &vc
#ifdef FEAT_MULTI_LANG
, lang
#endif
);
}
-#ifdef FEAT_MBYTE
if (vc.vc_type != CONV_NONE)
convert_setup(&vc, NULL, NULL);
-#endif
}
/*