| To: vim_dev@googlegroups.com |
| Subject: Patch 7.4.669 |
| Fcc: outbox |
| From: Bram Moolenaar <Bram@moolenaar.net> |
| Mime-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| |
| Patch 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) |
| Files: src/buffer.c, src/edit.c, src/move.c, src/netbeans.c, |
| src/screen.c, src/structs.h |
| |
| |
| |
| |
| |
| *** 5473,5478 **** |
| --- 5473,5482 ---- |
| |
| /* first sign in signlist */ |
| buf->b_signlist = newsign; |
| + #ifdef FEAT_NETBEANS_INTG |
| + if (netbeans_active()) |
| + buf->b_has_sign_column = TRUE; |
| + #endif |
| } |
| else |
| prev->next = newsign; |
| |
| |
| |
| *** 6687,6693 **** |
| #ifdef FEAT_SIGNS |
| if (curwin->w_buffer->b_signlist != NULL |
| # ifdef FEAT_NETBEANS_INTG |
| ! || netbeans_active() |
| # endif |
| ) |
| textwidth -= 1; |
| --- 6687,6693 ---- |
| #ifdef FEAT_SIGNS |
| if (curwin->w_buffer->b_signlist != NULL |
| # ifdef FEAT_NETBEANS_INTG |
| ! || curwin->w_buffer->b_has_sign_column |
| # endif |
| ) |
| textwidth -= 1; |
| |
| |
| |
| *** 905,911 **** |
| + ( |
| # ifdef FEAT_NETBEANS_INTG |
| /* show glyph gutter in netbeans */ |
| ! netbeans_active() || |
| # endif |
| wp->w_buffer->b_signlist != NULL ? 2 : 0) |
| #endif |
| --- 905,911 ---- |
| + ( |
| # ifdef FEAT_NETBEANS_INTG |
| /* show glyph gutter in netbeans */ |
| ! wp->w_buffer->b_has_sign_column || |
| # endif |
| wp->w_buffer->b_signlist != NULL ? 2 : 0) |
| #endif |
| |
| |
| |
| *** 144,149 **** |
| --- 144,154 ---- |
| static 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 |
| if (inputHandler != (XtInputId)NULL) |
| { |
| |
| |
| |
| *** 2214,2220 **** |
| { |
| return (wp->w_buffer->b_signlist != NULL |
| # ifdef FEAT_NETBEANS_INTG |
| ! || netbeans_active() |
| # endif |
| ); |
| } |
| --- 2214,2220 ---- |
| { |
| return (wp->w_buffer->b_signlist != NULL |
| # ifdef FEAT_NETBEANS_INTG |
| ! || wp->w_buffer->b_has_sign_column |
| # endif |
| ); |
| } |
| |
| |
| |
| *** 1805,1810 **** |
| --- 1805,1815 ---- |
| |
| #ifdef FEAT_SIGNS |
| 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 |
| |
| #ifdef FEAT_NETBEANS_INTG |
| |
| |
| |
| *** 743,744 **** |
| --- 743,746 ---- |
| { /* Add new patch number below this line */ |
| + /**/ |
| + 669, |
| /**/ |
| |
| -- |
| ARTHUR: You fight with the strength of many men, Sir knight. |
| I am Arthur, King of the Britons. [pause] |
| I seek the finest and the bravest knights in the land to join me |
| in my Court of Camelot. [pause] |
| You have proved yourself worthy; will you join me? [pause] |
| You make me sad. So be it. Come, Patsy. |
| BLACK KNIGHT: None shall pass. |
| The Quest for the Holy Grail (Monty Python) |
| |
| /// Bram Moolenaar -- Bram@Moolenaar.net -- 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 /// |