mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.4.669
Problem: When netbeans is active the sign column always shows up. Solution: Only show the sign column once a sign has been added. (Xavier de Gaye)
This commit is contained in:
parent
825e7ab423
commit
3b7b83649c
@ -5473,6 +5473,10 @@ insert_sign(buf, prev, next, id, lnum, typenr)
|
|||||||
|
|
||||||
/* first sign in signlist */
|
/* first sign in signlist */
|
||||||
buf->b_signlist = newsign;
|
buf->b_signlist = newsign;
|
||||||
|
#ifdef FEAT_NETBEANS_INTG
|
||||||
|
if (netbeans_active())
|
||||||
|
buf->b_has_sign_column = TRUE;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
prev->next = newsign;
|
prev->next = newsign;
|
||||||
|
@ -6687,7 +6687,7 @@ comp_textwidth(ff)
|
|||||||
#ifdef FEAT_SIGNS
|
#ifdef FEAT_SIGNS
|
||||||
if (curwin->w_buffer->b_signlist != NULL
|
if (curwin->w_buffer->b_signlist != NULL
|
||||||
# ifdef FEAT_NETBEANS_INTG
|
# ifdef FEAT_NETBEANS_INTG
|
||||||
|| netbeans_active()
|
|| curwin->w_buffer->b_has_sign_column
|
||||||
# endif
|
# endif
|
||||||
)
|
)
|
||||||
textwidth -= 1;
|
textwidth -= 1;
|
||||||
|
@ -905,7 +905,7 @@ win_col_off(wp)
|
|||||||
+ (
|
+ (
|
||||||
# ifdef FEAT_NETBEANS_INTG
|
# ifdef FEAT_NETBEANS_INTG
|
||||||
/* show glyph gutter in netbeans */
|
/* show glyph gutter in netbeans */
|
||||||
netbeans_active() ||
|
wp->w_buffer->b_has_sign_column ||
|
||||||
# endif
|
# endif
|
||||||
wp->w_buffer->b_signlist != NULL ? 2 : 0)
|
wp->w_buffer->b_signlist != NULL ? 2 : 0)
|
||||||
#endif
|
#endif
|
||||||
|
@ -144,6 +144,11 @@ static int inAtomic = 0;
|
|||||||
static void
|
static void
|
||||||
nb_close_socket(void)
|
nb_close_socket(void)
|
||||||
{
|
{
|
||||||
|
buf_T *buf;
|
||||||
|
|
||||||
|
for (buf = firstbuf; buf != NULL; buf = buf->b_next)
|
||||||
|
buf->b_has_sign_column = FALSE;
|
||||||
|
|
||||||
#ifdef FEAT_GUI_X11
|
#ifdef FEAT_GUI_X11
|
||||||
if (inputHandler != (XtInputId)NULL)
|
if (inputHandler != (XtInputId)NULL)
|
||||||
{
|
{
|
||||||
|
@ -2214,7 +2214,7 @@ draw_signcolumn(wp)
|
|||||||
{
|
{
|
||||||
return (wp->w_buffer->b_signlist != NULL
|
return (wp->w_buffer->b_signlist != NULL
|
||||||
# ifdef FEAT_NETBEANS_INTG
|
# ifdef FEAT_NETBEANS_INTG
|
||||||
|| netbeans_active()
|
|| wp->w_buffer->b_has_sign_column
|
||||||
# endif
|
# endif
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -1805,6 +1805,11 @@ struct file_buffer
|
|||||||
|
|
||||||
#ifdef FEAT_SIGNS
|
#ifdef FEAT_SIGNS
|
||||||
signlist_T *b_signlist; /* list of signs to draw */
|
signlist_T *b_signlist; /* list of signs to draw */
|
||||||
|
# ifdef FEAT_NETBEANS_INTG
|
||||||
|
int b_has_sign_column; /* Flag that is set when a first sign is
|
||||||
|
* added and remains set until the end of
|
||||||
|
* the netbeans session. */
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef FEAT_NETBEANS_INTG
|
#ifdef FEAT_NETBEANS_INTG
|
||||||
|
@ -741,6 +741,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
669,
|
||||||
/**/
|
/**/
|
||||||
668,
|
668,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user