File tree Expand file tree Collapse file tree 5 files changed +10
-19
lines changed Expand file tree Collapse file tree 5 files changed +10
-19
lines changed Original file line number Diff line number Diff line change @@ -1419,7 +1419,7 @@ check_due_timer(void)
1419
1419
bevalexpr_due_set = FALSE;
1420
1420
if (balloonEval == NULL )
1421
1421
{
1422
- balloonEval = (BalloonEval * )alloc (sizeof (BalloonEval ));
1422
+ balloonEval = (BalloonEval * )alloc_clear (sizeof (BalloonEval ));
1423
1423
balloonEvalForTerm = TRUE;
1424
1424
}
1425
1425
if (balloonEval != NULL )
Original file line number Diff line number Diff line change @@ -745,7 +745,12 @@ gui_init(void)
745
745
/* Always create the Balloon Evaluation area, but disable it when
746
746
* 'ballooneval' is off. */
747
747
if (balloonEval != NULL )
748
+ {
749
+ # ifdef FEAT_VARTABS
750
+ vim_free (balloonEval -> vts );
751
+ # endif
748
752
vim_free (balloonEval );
753
+ }
749
754
balloonEvalForTerm = FALSE;
750
755
# ifdef FEAT_GUI_GTK
751
756
balloonEval = gui_mch_create_beval_area (gui .drawarea , NULL ,
Original file line number Diff line number Diff line change @@ -111,28 +111,19 @@ gui_mch_create_beval_area(
111
111
return NULL ;
112
112
}
113
113
114
- beval = (BalloonEval * )alloc (sizeof (BalloonEval ));
114
+ beval = (BalloonEval * )alloc_clear (sizeof (BalloonEval ));
115
115
if (beval != NULL )
116
116
{
117
117
#ifdef FEAT_GUI_GTK
118
118
beval -> target = GTK_WIDGET (target );
119
- beval -> balloonShell = NULL ;
120
- beval -> timerID = 0 ;
121
119
#else
122
120
beval -> target = (Widget )target ;
123
- beval -> balloonShell = NULL ;
124
- beval -> timerID = (XtIntervalId )NULL ;
125
121
beval -> appContext = XtWidgetToApplicationContext ((Widget )target );
126
122
#endif
127
123
beval -> showState = ShS_NEUTRAL ;
128
- beval -> x = 0 ;
129
- beval -> y = 0 ;
130
124
beval -> msg = mesg ;
131
125
beval -> msgCB = mesgCB ;
132
126
beval -> clientData = clientData ;
133
- #ifdef FEAT_VARTABS
134
- beval -> vts = NULL ;
135
- #endif
136
127
137
128
/*
138
129
* Set up event handler which will keep its eyes on the pointer,
Original file line number Diff line number Diff line change @@ -8922,28 +8922,21 @@ gui_mch_create_beval_area(
8922
8922
return NULL ;
8923
8923
}
8924
8924
8925
- beval = (BalloonEval * )alloc (sizeof (BalloonEval ));
8925
+ beval = (BalloonEval * )alloc_clear (sizeof (BalloonEval ));
8926
8926
if (beval != NULL )
8927
8927
{
8928
8928
beval -> target = s_textArea ;
8929
- beval -> balloon = NULL ;
8930
8929
8931
8930
beval -> showState = ShS_NEUTRAL ;
8932
- beval -> x = 0 ;
8933
- beval -> y = 0 ;
8934
8931
beval -> msg = mesg ;
8935
8932
beval -> msgCB = mesgCB ;
8936
8933
beval -> clientData = clientData ;
8937
- #ifdef FEAT_VARTABS
8938
- beval -> vts = NULL ;
8939
- #endif
8940
8934
8941
8935
InitCommonControls ();
8942
8936
cur_beval = beval ;
8943
8937
8944
8938
if (p_beval )
8945
8939
gui_mch_enable_beval_area (beval );
8946
-
8947
8940
}
8948
8941
return beval ;
8949
8942
}
Original file line number Diff line number Diff line change @@ -789,6 +789,8 @@ static char *(features[]) =
789
789
790
790
static int included_patches [] =
791
791
{ /* Add new patch number below this line */
792
+ /**/
793
+ 121 ,
792
794
/**/
793
795
120 ,
794
796
/**/
You can’t perform that action at this time.
0 commit comments