summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-03-18 11:22:25 +0000
committerBram Moolenaar <Bram@vim.org>2009-03-18 11:22:25 +0000
commit8281f445186de469b9466d119c840d7ccdedfe87 (patch)
treedbb06caafe9c078e71e26e2aecca1d23430ebf81
parent2bea291af0fbbdcbcfd7812cf4f294699dfc00b9 (diff)
downloadvim-git-8281f445186de469b9466d119c840d7ccdedfe87.tar.gz
updated for version 7.2-142v7.2.142
-rw-r--r--src/gui_beval.c17
-rw-r--r--src/version.c2
2 files changed, 19 insertions, 0 deletions
diff --git a/src/gui_beval.c b/src/gui_beval.c
index 7adde4ea5..e0d7b9c9e 100644
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -1291,6 +1291,23 @@ drawBalloon(beval)
XtNy, ty,
NULL);
#endif
+ /* Set tooltip colors */
+ {
+ Arg args[2];
+
+#ifdef FEAT_GUI_MOTIF
+ args[0].name = XmNbackground;
+ args[0].value = gui.tooltip_bg_pixel;
+ args[1].name = XmNforeground;
+ args[1].value = gui.tooltip_fg_pixel;
+#else /* Athena */
+ args[0].name = XtNbackground;
+ args[0].value = gui.tooltip_bg_pixel;
+ args[1].name = XtNforeground;
+ args[1].value = gui.tooltip_fg_pixel;
+#endif
+ XtSetValues(beval->balloonLabel, &args[0], XtNumber(args));
+ }
XtPopup(beval->balloonShell, XtGrabNone);
diff --git a/src/version.c b/src/version.c
index e9dd27239..8ba2de2ff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 142,
+/**/
141,
/**/
140,