Mercurial > vim

comparison src/diff.c @ 15971:ced614446eaa v8.1.0991

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0991: cannot build with a mix of features commit https://github.com/vim/vim/commit/975880b6e6de473b512995ef87ce072aaca934cf Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 3 14:42:11 2019 +0100 patch 8.1.0991: cannot build with a mix of features Problem: Cannot build with FEAT_EVAL defined and FEAT_SEARCH_EXTRA undefined, and with FEAT_DIFF defined and FEAT_EVAL undefined. Solution: Add a couple of #ifdefs. (closes #4067)
author Bram Moolenaar <Bram@vim.org>
date Sun, 03 Mar 2019 14:45:06 +0100
parents 360c93a884d0
children ef00b6bc186b
comparison
equal deleted inserted replaced
15970:4b4561a386cd 15971:ced614446eaa
864 * diff will be used anyway. 864 * diff will be used anyway.
865 */ 865 */
866 int 866 int
867 diff_internal(void) 867 diff_internal(void)
868 { 868 {
869 return (diff_flags & DIFF_INTERNAL) != 0 && *p_dex == NUL; 869 return (diff_flags & DIFF_INTERNAL) != 0
870 #ifdef FEAT_EVAL
871 && *p_dex == NUL
872 #endif
873 ;
870 } 874 }
871 875
872 /* 876 /*
873 * Return TRUE if the internal diff failed for one of the diff buffers. 877 * Return TRUE if the internal diff failed for one of the diff buffers.
874 */ 878 */