Patch 8.1.1661
Problem: Cannot build with +textprop but without +balloon_eval.
Solution: Adjust #ifdefs. (closes #4645)
Files: src/proto.h
*** ../vim-8.1.1660/src/proto.h 2019-06-14 21:36:51.018437479 +0200
--- src/proto.h 2019-07-10 22:17:13.172692325 +0200
***************
*** 230,242 ****
# include "if_ruby.pro"
# endif
! /* Ugly solution for "BalloonEval" not being defined while it's used in some
! * .pro files. */
! # ifdef FEAT_BEVAL
! # include "beval.pro"
! # else
# define BalloonEval int
# endif
# ifdef FEAT_NETBEANS_INTG
# include "netbeans.pro"
--- 230,243 ----
# include "if_ruby.pro"
# endif
! // Ugly solution for "BalloonEval" not being defined while it's used in some
! // .pro files.
! # ifndef FEAT_BEVAL
# define BalloonEval int
# endif
+ # if defined(FEAT_BEVAL) || defined(FEAT_TEXT_PROP)
+ # include "beval.pro"
+ # endif
# ifdef FEAT_NETBEANS_INTG
# include "netbeans.pro"
*** ../vim-8.1.1660/src/version.c 2019-07-10 22:04:44.960086645 +0200
--- src/version.c 2019-07-10 22:20:02.007934938 +0200
***************
*** 779,780 ****
--- 779,782 ----
{ /* Add new patch number below this line */
+ /**/
+ 1661,
/**/
--
BLACK KNIGHT: Come on you pansy!
[hah] [parry thrust]
[ARTHUR chops the BLACK KNIGHT's right arm off]
ARTHUR: Victory is mine! [kneeling]
We thank thee Lord, that in thy merc-
[Black Knight kicks Arthur in the head while he is praying]
The Quest for the Holy Grail (Monty Python)
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/201907102022.x6AKM42X004408%40masaka.moolenaar.net.
For more options, visit https://groups.google.com/d/optout.
