Mercurial > vim

diff src/feature.h @ 27020:0f2dd0d07071 v8.2.4039

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4039: the xdiff library is linked in even when not used Commit: https://github.com/vim/vim/commit/67ffb417861a90fd2c1b215a42fd230272ed94cb Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 8 13:36:57 2022 +0000 patch 8.2.4039: the xdiff library is linked in even when not used Problem: The xdiff library is linked in even when not used. Solution: Use configure to decide whether xdiff object files are included.
author Bram Moolenaar <Bram@vim.org>
date Sat, 08 Jan 2022 14:45:03 +0100
parents 06a137af96f8
children 41a940219183
line wrap: on
line diff
--- 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