summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-17 20:54:31 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-17 20:54:31 +0200
commit397c6a1438186adef54fe5113690307e644b0f42 (patch)
treeaff710463c890184949463b3732d4ae83bdaf806
parent37d1807a801d5296f00b3ac85a38b26cfe6de55c (diff)
downloadvim-git-397c6a1438186adef54fe5113690307e644b0f42.tar.gz
patch 8.1.2049: cannot build tiny versionv8.1.2049
Problem: Cannot build tiny version. Solution: Add #ifdefs.
-rw-r--r--src/main.c8
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index ff3d2349f..52bbafe6c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1061,11 +1061,13 @@ may_trigger_safestate(int safe)
&& scriptin[curscript] == NULL
&& !global_busy;
+#ifdef FEAT_JOB_CHANNEL
if (was_safe != is_safe)
// Only log when the state changes, otherwise it happens at nearly
// every key stroke.
ch_log(NULL, is_safe ? "Start triggering SafeState"
: "Stop triggering SafeState");
+#endif
if (is_safe)
apply_autocmds(EVENT_SAFESTATE, NULL, NULL, FALSE, curbuf);
was_safe = is_safe;
@@ -1079,8 +1081,10 @@ may_trigger_safestate(int safe)
void
state_no_longer_safe(void)
{
+#ifdef FEAT_JOB_CHANNEL
if (was_safe)
ch_log(NULL, "safe state reset");
+#endif
was_safe = FALSE;
}
@@ -1093,11 +1097,15 @@ may_trigger_safestateagain(void)
{
if (was_safe)
{
+#ifdef FEAT_JOB_CHANNEL
ch_log(NULL, "Leaving unsafe area, triggering SafeStateAgain");
+#endif
apply_autocmds(EVENT_SAFESTATEAGAIN, NULL, NULL, FALSE, curbuf);
}
+#ifdef FEAT_JOB_CHANNEL
else
ch_log(NULL, "Leaving unsafe area, not triggering SafeStateAgain");
+#endif
}
diff --git a/src/version.c b/src/version.c
index b8c88081d..1f120d398 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2049,
+/**/
2048,
/**/
2047,