Mercurial > vim

comparison src/proto.h @ 17324:066d77831630 v8.1.1661

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1661: cannot build with +textprop but without +balloon_eval commit https://github.com/vim/vim/commit/247bf0de465411e4ebb1c0fe1a9e07f4a7f77e91 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jul 10 22:21:48 2019 +0200 patch 8.1.1661: cannot build with +textprop but without +balloon_eval Problem: Cannot build with +textprop but without +balloon_eval. Solution: Adjust #ifdefs. (closes https://github.com/vim/vim/issues/4645)
author Bram Moolenaar <Bram@vim.org>
date Wed, 10 Jul 2019 22:30:04 +0200
parents 3147c7c2e86b
children ba06a1c42274
comparison
equal deleted inserted replaced
17323:66db69fb9b4b 17324:066d77831630
228 228
229 # ifdef FEAT_RUBY 229 # ifdef FEAT_RUBY
230 # include "if_ruby.pro" 230 # include "if_ruby.pro"
231 # endif 231 # endif
232 232
233 /* Ugly solution for "BalloonEval" not being defined while it's used in some 233 // Ugly solution for "BalloonEval" not being defined while it's used in some
234 * .pro files. */ 234 // .pro files.
235 # ifdef FEAT_BEVAL 235 # ifndef FEAT_BEVAL
236 # define BalloonEval int
237 # endif
238 # if defined(FEAT_BEVAL) || defined(FEAT_TEXT_PROP)
236 # include "beval.pro" 239 # include "beval.pro"
237 # else
238 # define BalloonEval int
239 # endif 240 # endif
240 241
241 # ifdef FEAT_NETBEANS_INTG 242 # ifdef FEAT_NETBEANS_INTG
242 # include "netbeans.pro" 243 # include "netbeans.pro"
243 # endif 244 # endif