patch 9.0.0263: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Make some functions always available.
diff --git a/src/buffer.c b/src/buffer.c
index f2f32e1..ebba88b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -222,9 +222,7 @@
// Read the file if there is one.
if (curbuf->b_ffname != NULL
-#ifdef FEAT_QUICKFIX
&& !bt_quickfix(curbuf)
-#endif
&& !bt_nofilename(curbuf)
#ifdef FEAT_NETBEANS_INTG
&& netbeansReadFile
@@ -1328,11 +1326,7 @@
return FAIL;
}
#ifdef FEAT_PROP_POPUP
- if ((flags & DOBUF_NOPOPUP) && bt_popup(buf)
-# ifdef FEAT_TERMINAL
- && !bt_terminal(buf)
-#endif
- )
+ if ((flags & DOBUF_NOPOPUP) && bt_popup(buf) && !bt_terminal(buf))
return OK;
#endif
@@ -1445,11 +1439,7 @@
{
// Skip current and unlisted bufs. Also skip a quickfix
// buffer, it might be deleted soon.
- if (buf == curbuf || !buf->b_p_bl
-#if defined(FEAT_QUICKFIX)
- || bt_quickfix(buf)
-#endif
- )
+ if (buf == curbuf || !buf->b_p_bl || bt_quickfix(buf))
buf = NULL;
else if (buf->b_ml.ml_mfp == NULL)
{
@@ -1487,10 +1477,7 @@
}
// in non-help buffer, try to skip help buffers, and vv
if (buf->b_help == curbuf->b_help && buf->b_p_bl
-#if defined(FEAT_QUICKFIX)
- && !bt_quickfix(buf)
-#endif
- )
+ && !bt_quickfix(buf))
{
if (buf->b_ml.ml_mfp != NULL) // found loaded buffer
break;
@@ -1508,11 +1495,7 @@
if (buf == NULL) // No loaded buffer, find listed one
{
FOR_ALL_BUFFERS(buf)
- if (buf->b_p_bl && buf != curbuf
-#if defined(FEAT_QUICKFIX)
- && !bt_quickfix(buf)
-#endif
- )
+ if (buf->b_p_bl && buf != curbuf && !bt_quickfix(buf))
break;
}
if (buf == NULL) // Still no buffer, just take one
@@ -1521,10 +1504,8 @@
buf = curbuf->b_next;
else
buf = curbuf->b_prev;
-#if defined(FEAT_QUICKFIX)
if (bt_quickfix(buf))
buf = NULL;
-#endif
}
}
@@ -1987,9 +1968,7 @@
&& curbuf->b_ffname == NULL
&& curbuf->b_nwindows <= 1
&& (curbuf->b_ml.ml_mfp == NULL || BUFEMPTY())
-#if defined(FEAT_QUICKFIX)
&& !bt_quickfix(curbuf)
-#endif
&& !curbufIsChanged());
}
@@ -3787,15 +3766,9 @@
vim_snprintf_add(buffer, IOSIZE, "\"%s%s%s%s%s%s",
curbufIsChanged() ? (shortmess(SHM_MOD)
? " [+]" : _(" [Modified]")) : " ",
- (curbuf->b_flags & BF_NOTEDITED)
-#ifdef FEAT_QUICKFIX
- && !bt_dontwrite(curbuf)
-#endif
+ (curbuf->b_flags & BF_NOTEDITED) && !bt_dontwrite(curbuf)
? _("[Not edited]") : "",
- (curbuf->b_flags & BF_NEW)
-#ifdef FEAT_QUICKFIX
- && !bt_dontwrite(curbuf)
-#endif
+ (curbuf->b_flags & BF_NEW) && !bt_dontwrite(curbuf)
? new_file_message() : "",
(curbuf->b_flags & BF_READERR) ? _("[Read errors]") : "",
curbuf->b_p_ro ? (shortmess(SHM_RO) ? _("[RO]")
@@ -5676,27 +5649,31 @@
return buf != NULL && buf->b_p_bt[0] == NUL;
}
-#if defined(FEAT_QUICKFIX) || defined(PROTO)
/*
* Return TRUE if "buf" is the quickfix buffer.
*/
int
bt_quickfix(buf_T *buf)
{
+#ifdef FEAT_QUICKFIX
return buf != NULL && buf->b_p_bt[0] == 'q';
-}
+#else
+ return FALSE;
#endif
+}
-#if defined(FEAT_TERMINAL) || defined(PROTO)
/*
* Return TRUE if "buf" is a terminal buffer.
*/
int
bt_terminal(buf_T *buf)
{
+#if defined(FEAT_TERMINAL)
return buf != NULL && buf->b_p_bt[0] == 't';
-}
+#else
+ return FALSE;
#endif
+}
/*
* Return TRUE if "buf" is a help buffer.
@@ -5764,7 +5741,6 @@
|| buf->b_p_bt[0] == 'p');
}
-#if defined(FEAT_QUICKFIX) || defined(PROTO)
int
bt_dontwrite_msg(buf_T *buf)
{
@@ -5775,7 +5751,6 @@
}
return FALSE;
}
-#endif
/*
* Return TRUE if the buffer should be hidden, according to 'hidden', ":hide"