To: vim-dev@vim.org Subject: Patch 6.1.416 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.416 (depends on 6.1.366) Problem: When using the Netbeans interface, a line with a sign cannot be changed. Solution: Respect the GUARDEDOFFSET for sign IDs when checking for a guarded area. Files: src/netbeans.c *** ../vim61.415/src/netbeans.c Sat Mar 15 16:13:28 2003 --- src/netbeans.c Wed Mar 26 10:10:43 2003 *************** *** 2568,2591 **** /* * See if the lines are guarded. The top and bot parameters are from ! * u_savecommon() and are translated to 'to' and 'from' values before ! * testing. ! * ! * Note: top and bot are 0 based but p->lnum is 1 based. So to and from ! * must be corrected for this. */ int netbeans_is_guarded(linenr_T top, linenr_T bot) { ! signlist_T *p; ! int lnum; for (p = curbuf->b_signlist; p != NULL; p = p->next) ! { ! for (lnum = top + 1; lnum < bot; lnum++) if (lnum == p->lnum) ! return TRUE; ! } return FALSE; } --- 2568,2587 ---- /* * See if the lines are guarded. The top and bot parameters are from ! * u_savecommon(), these are the line above the change and the line below the ! * change. */ int netbeans_is_guarded(linenr_T top, linenr_T bot) { ! signlist_T *p; ! int lnum; for (p = curbuf->b_signlist; p != NULL; p = p->next) ! if (p->id >= GUARDEDOFFSET) ! for (lnum = top + 1; lnum < bot; lnum++) if (lnum == p->lnum) ! return TRUE; return FALSE; } *** ../vim61.415/src/version.c Tue Mar 25 22:30:59 2003 --- src/version.c Wed Mar 26 10:18:22 2003 *************** *** 613,614 **** --- 613,616 ---- { /* Add new patch number below this line */ + /**/ + 416, /**/ -- hundred-and-one symptoms of being an internet addict: 215. Your mouse-clicking forearm rivals Popeye's. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///