diff --git a/7.2.079 b/7.2.079 new file mode 100644 index 0000000..60da797 --- /dev/null +++ b/7.2.079 @@ -0,0 +1,229 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.079 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.079 +Problem: "killed" netbeans events are not handled correctly. +Solution: A "killed" netbeans event is sent when the buffer is deleted or + wiped out (in this case, the netbeans annotations in this buffer + have been removed). A user can still remove a sign with the + command ":sign unplace" and this does not trigger a "killed" + event. (Xavier de Gaye) +Files: runtime/doc/netbeans.txt, src/buffer.c, src/globals.h, + src/netbeans.c, src/proto/netbeans.pro + + +*** ../vim-7.2.078/runtime/doc/netbeans.txt Sat Aug 9 19:36:49 2008 +--- runtime/doc/netbeans.txt Tue Jan 6 15:23:39 2009 +*************** +*** 1,4 **** +! *netbeans.txt* For Vim version 7.2. Last change: 2008 Jun 28 + + + VIM REFERENCE MANUAL by Gordon Prieur et al. +--- 1,4 ---- +! *netbeans.txt* For Vim version 7.2. Last change: 2009 Jan 06 + + + VIM REFERENCE MANUAL by Gordon Prieur et al. +*************** +*** 722,729 **** + of the cursor. + New in version 2.1. + +! killed A file was closed by the user. Only for files that have been +! assigned a number by the IDE. + + newDotAndMark off off + Reports the position of the cursor being at "off" bytes into +--- 722,731 ---- + of the cursor. + New in version 2.1. + +! killed A file was deleted or wiped out by the user and the buffer +! annotations have been removed. The bufID number for this +! buffer has become invalid. Only for files that have been +! assigned a bufID number by the IDE. + + newDotAndMark off off + Reports the position of the cursor being at "off" bytes into +*** ../vim-7.2.078/src/buffer.c Wed Dec 3 11:21:20 2008 +--- src/buffer.c Tue Jan 6 15:23:02 2009 +*************** +*** 437,446 **** + return; + #endif + +- #ifdef FEAT_NETBEANS_INTG +- if (usingNetbeans) +- netbeans_file_closed(buf); +- #endif + /* Change directories when the 'acd' option is set. */ + DO_AUTOCHDIR + +--- 437,442 ---- +*************** +*** 639,644 **** +--- 635,644 ---- + #ifdef FEAT_SIGNS + buf_delete_signs(buf); /* delete any signs */ + #endif ++ #ifdef FEAT_NETBEANS_INTG ++ if (usingNetbeans) ++ netbeans_file_killed(buf); ++ #endif + #ifdef FEAT_LOCALMAP + map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE); /* clear local mappings */ + map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE); /* clear local abbrevs */ +*************** +*** 815,823 **** + int bnr; /* buffer number */ + char_u *p; + +- #ifdef FEAT_NETBEANS_INTG +- netbeansCloseFile = 1; +- #endif + if (addr_count == 0) + { + (void)do_buffer(command, DOBUF_CURRENT, FORWARD, 0, forceit); +--- 815,820 ---- +*************** +*** 912,920 **** + } + } + +- #ifdef FEAT_NETBEANS_INTG +- netbeansCloseFile = 0; +- #endif + + return errormsg; + } +--- 909,914 ---- +*** ../vim-7.2.078/src/globals.h Fri Nov 28 21:26:50 2008 +--- src/globals.h Tue Jan 6 15:23:02 2009 +*************** +*** 1340,1346 **** + + #ifdef FEAT_NETBEANS_INTG + EXTERN char *netbeansArg INIT(= NULL); /* the -nb[:host:port:passwd] arg */ +- EXTERN int netbeansCloseFile INIT(= 0); /* send killed if != 0 */ + EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */ + EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */ + EXTERN int netbeansReadFile INIT(= 1); /* OK to read from disk if != 0 */ +--- 1340,1345 ---- +*** ../vim-7.2.078/src/netbeans.c Wed Dec 24 12:20:10 2008 +--- src/netbeans.c Tue Jan 6 15:23:02 2009 +*************** +*** 2921,2964 **** + } + + /* +! * Tell netbeans a file was closed. + */ + void +! netbeans_file_closed(buf_T *bufp) + { + int bufno = nb_getbufno(bufp); + nbbuf_T *nbbuf = nb_get_buf(bufno); + char buffer[2*MAXPATHL]; + +! if (!haveConnection || bufno < 0) + return; + +! if (!netbeansCloseFile) +! { +! nbdebug(("Ignoring file_closed for %s. File was closed from IDE\n", +! bufp->b_ffname)); +! return; +! } +! +! nbdebug(("netbeans_file_closed:\n")); +! nbdebug((" Closing bufno: %d", bufno)); +! if (curbuf != NULL && curbuf != bufp) +! { +! nbdebug((" Curbuf bufno: %d\n", nb_getbufno(curbuf))); +! } +! else if (curbuf == bufp) +! { +! nbdebug((" curbuf == bufp\n")); +! } +! +! if (bufno <= 0) +! return; + + sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno); + + nbdebug(("EVT: %s", buffer)); + +! nb_send(buffer, "netbeans_file_closed"); + + if (nbbuf != NULL) + nbbuf->bufp = NULL; +--- 2921,2946 ---- + } + + /* +! * Tell netbeans that a file was deleted or wiped out. + */ + void +! netbeans_file_killed(buf_T *bufp) + { + int bufno = nb_getbufno(bufp); + nbbuf_T *nbbuf = nb_get_buf(bufno); + char buffer[2*MAXPATHL]; + +! if (!haveConnection || bufno == -1) + return; + +! nbdebug(("netbeans_file_killed:\n")); +! nbdebug((" Killing bufno: %d", bufno)); + + sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno); + + nbdebug(("EVT: %s", buffer)); + +! nb_send(buffer, "netbeans_file_killed"); + + if (nbbuf != NULL) + nbbuf->bufp = NULL; +*** ../vim-7.2.078/src/proto/netbeans.pro Tue Jun 24 23:25:53 2008 +--- src/proto/netbeans.pro Tue Jan 6 15:23:02 2009 +*************** +*** 11,17 **** + void netbeans_frame_moved __ARGS((int new_x, int new_y)); + void netbeans_file_activated __ARGS((buf_T *bufp)); + void netbeans_file_opened __ARGS((buf_T *bufp)); +! void netbeans_file_closed __ARGS((buf_T *bufp)); + void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen)); + void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len)); + void netbeans_unmodified __ARGS((buf_T *bufp)); +--- 11,17 ---- + void netbeans_frame_moved __ARGS((int new_x, int new_y)); + void netbeans_file_activated __ARGS((buf_T *bufp)); + void netbeans_file_opened __ARGS((buf_T *bufp)); +! void netbeans_file_killed __ARGS((buf_T *bufp)); + void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen)); + void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len)); + void netbeans_unmodified __ARGS((buf_T *bufp)); +*** ../vim-7.2.078/src/version.c Tue Jan 6 15:01:58 2009 +--- src/version.c Tue Jan 6 16:11:11 2009 +*************** +*** 678,679 **** +--- 678,681 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 79, + /**/ + +-- +Friends? I have lots of friends! In fact, I have every episode ever made. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ download, build and distribute -- http://www.A-A-P.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/README.patches b/README.patches index 2a8aff2..84ca99b 100644 --- a/README.patches +++ b/README.patches @@ -65,7 +65,7 @@ Individual patches for Vim 7.2: 2438 7.2.038 overlapping arguments to memcpy() 1378 7.2.039 accessing freed memory on exit when EXITFREE is defined 1836 7.2.040 ":e ++ff=dos foo" gets "unix" 'ff' when CR before NL missing - 22993 7.2.041 diff messed up when editing a diff buffer in another tab page + 22993 7.2.041 (extra) diff wrong when edit diff buffer in another tab page 4987 7.2.042 restoring view in autocmd sometimes doesn't work completely 2550 7.2.043 VMS: Too many chars escaped in filename and shell commands 5639 7.2.044 crash because of gcc 4 being over protective for strcpy() @@ -85,3 +85,22 @@ Individual patches for Vim 7.2: 2338 7.2.058 can't add a feature name in the :version output 1847 7.2.059 diff is not always displayed properly 34772 7.2.060 spell checking doesn't work well for compound words + 1886 7.2.061 creating funcref requires loading the autoload script first + 1657 7.2.062 "[Scratch]" is not translated + 3558 7.2.063 warning for NULL argument of Perl_sys_init3() + 1942 7.2.064 repeating "~" on a Visual block doesn't always update screen + 5149 7.2.065 GTK GUI: cursor disappears doing ":vsp" when maximized + 2759 7.2.066 not easy to check if 'encoding' is a multi-byte encoding + 1683 7.2.067 can't load sesison extra file when it contains special chars + 2598 7.2.068 error when Emacs tags file line is too long + 1726 7.2.069 (after 7.2.060) compiler warning for putting size_t in int + 17606 7.2.070 crash when a function returns a:000 + 2353 7.2.071 (extra) Win32: Handling netbeans events may cause a crash + 1615 7.2.072 (extra, fixed patch) compiler warning in Sniff code + 4121 7.2.073 ":set " has the same output as ":set " + 1832 7.2.074 (extra, after 7.2.073) extra part of 7.2.073 + 2218 7.2.075 (after 7.2.058) unclear comment about making a diff + 2666 7.2.076 rename(from, to) deletes file if names refer to the same file + 4745 7.2.077 (after 7.2.076) rename() fails if names differ only in case + 3298 7.2.078 problems with deleting folds + 6947 7.2.079 "killed" netbeans events are not handled correctly diff --git a/vim.spec b/vim.spec index 25e8dcc..ae92a23 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 060 +%define patchlevel 079 Summary: The VIM editor URL: http://www.vim.org/ @@ -126,6 +126,25 @@ Patch057: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.057 Patch058: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.058 Patch059: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.059 Patch060: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.060 +Patch061: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.061 +Patch062: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.062 +Patch063: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.063 +Patch064: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.064 +Patch065: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.065 +Patch066: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.066 +Patch067: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.067 +Patch068: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.068 +Patch069: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.069 +Patch070: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.070 +Patch071: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.071 +Patch072: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.072 +Patch073: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.073 +Patch074: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.074 +Patch075: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.075 +Patch076: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.076 +Patch077: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.077 +Patch078: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.078 +Patch079: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.079 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -319,6 +338,25 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch058 -p0 %patch059 -p0 %patch060 -p0 +%patch061 -p0 +%patch062 -p0 +%patch063 -p0 +%patch064 -p0 +%patch065 -p0 +%patch066 -p0 +%patch067 -p0 +%patch068 -p0 +%patch069 -p0 +%patch070 -p0 +%patch071 -p0 +%patch072 -p0 +%patch073 -p0 +%patch074 -p0 +%patch075 -p0 +%patch076 -p0 +%patch077 -p0 +%patch078 -p0 +%patch079 -p0 # install spell files @@ -778,6 +816,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Jan 08 2009 Karsten Hopp 7.2.079-2 +- patchlevel 79 + * Thu Dec 04 2008 Jesse Keating - 7.2.060-2 - Rebuild for new python.