summaryrefslogtreecommitdiff
path: root/src/feature.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-08 13:36:57 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-08 13:36:57 +0000
commit67ffb417861a90fd2c1b215a42fd230272ed94cb (patch)
tree25b56d4048bbabe4d6c4aef70517d686985718ac /src/feature.h
parent748b308eebe8d8860888eb27da08333f175d547d (diff)
downloadvim-git-67ffb417861a90fd2c1b215a42fd230272ed94cb.tar.gz
patch 8.2.4039: the xdiff library is linked in even when not usedv8.2.4039
Problem: The xdiff library is linked in even when not used. Solution: Use configure to decide whether xdiff object files are included.
Diffstat (limited to 'src/feature.h')
-rw-r--r--src/feature.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/feature.h b/src/feature.h
index fcd0d4b5c..b2df6f9a5 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -345,8 +345,9 @@
/*
* +diff Displaying diffs in a nice way.
* Requires +windows and +autocmd.
+ * Can be enabled in autoconf already.
*/
-#if defined(FEAT_NORMAL)
+#if defined(FEAT_NORMAL) && !defined(FEAT_DIFF)
# define FEAT_DIFF
#endif