Author: glen Date: Tue Oct 5 07:23:52 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 7.3.019
---- Files affected: packages/vim: vim.spec (1.526 -> 1.527) , 7.3.004 (NONE -> 1.1) (NEW), 7.3.005 (NONE -> 1.1) (NEW), 7.3.006 (NONE -> 1.1) (NEW), 7.3.007 (NONE -> 1.1) (NEW), 7.3.008 (NONE -> 1.1) (NEW), 7.3.009 (NONE -> 1.1) (NEW), 7.3.010 (NONE -> 1.1) (NEW), 7.3.011 (NONE -> 1.1) (NEW), 7.3.012 (NONE -> 1.1) (NEW), 7.3.013 (NONE -> 1.1) (NEW), 7.3.014 (NONE -> 1.1) (NEW), 7.3.015 (NONE -> 1.1) (NEW), 7.3.016 (NONE -> 1.1) (NEW), 7.3.017 (NONE -> 1.1) (NEW), 7.3.018 (NONE -> 1.1) (NEW), 7.3.019 (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/vim/vim.spec diff -u packages/vim/vim.spec:1.526 packages/vim/vim.spec:1.527 --- packages/vim/vim.spec:1.526 Sun Aug 22 11:29:23 2010 +++ packages/vim/vim.spec Tue Oct 5 09:23:46 2010 @@ -28,7 +28,7 @@ # curl -s ftp://ftp.vim.org/pub/editors/vim/patches/7.3/MD5SUMS | grep -vF .gz | tail -n1 | awk '{print $2}' %define ver 7.3 -%define patchlevel 003 +%define patchlevel 019 %define rel 1 Summary: Vi IMproved - a Vi clone Summary(de.UTF-8): VIsual editor iMproved @@ -1380,6 +1380,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.527 2010/10/05 07:23:46 glen +- up to 7.3.019 + Revision 1.526 2010/08/22 09:29:23 glen - up to 7.3.003, rel macro is back, not to increment epoch accidentally ================================================================ Index: packages/vim/7.3.004 diff -u /dev/null packages/vim/7.3.004:1.1 --- /dev/null Tue Oct 5 09:23:52 2010 +++ packages/vim/7.3.004 Tue Oct 5 09:23:46 2010 @@ -0,0 +1,44 @@ +To: [email protected] +Subject: Patch 7.3.004 +Fcc: outbox +From: Bram Moolenaar <[email protected]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.004 +Problem: Crash when using very long regexp. (Peter Odding) +Solution: Reset reg_toolong. (Carlo Teubner) +Files: src/regexp.c + + +*** ../vim-7.3.003/src/regexp.c 2010-08-15 21:57:29.000000000 +0200 +--- src/regexp.c 2010-09-14 10:51:22.000000000 +0200 +*************** +*** 3538,3543 **** +--- 3538,3544 ---- + + regline = line; + reglnum = 0; ++ reg_toolong = FALSE; + + /* Simplest case: Anchored match need be tried only once. */ + if (prog->reganch) +*** ../vim-7.3.003/src/version.c 2010-08-17 20:23:18.000000000 +0200 +--- src/version.c 2010-09-14 10:52:09.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 4, + /**/ + +-- +I have a watch cat! Just break in and she'll watch. + + /// Bram Moolenaar -- [email protected] -- 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 /// ================================================================ Index: packages/vim/7.3.005 diff -u /dev/null packages/vim/7.3.005:1.1 --- /dev/null Tue Oct 5 09:23:52 2010 +++ packages/vim/7.3.005 Tue Oct 5 09:23:46 2010 @@ -0,0 +1,96 @@ +To: [email protected] +Subject: Patch 7.3.005 +Fcc: outbox +From: Bram Moolenaar <[email protected]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.005 +Problem: Crash when using undotree(). (Christian Brabandt) +Solution: Increase the list reference count. Add a test for undotree() + (Lech Lorens) +Files: src/eval.c, src/testdir/Makefile, src/testdir/test61.in + + +*** ../vim-7.3.004/src/eval.c 2010-08-15 21:57:26.000000000 +0200 +--- src/eval.c 2010-09-14 12:43:04.000000000 +0200 +*************** +*** 7075,7081 **** + } + + /* +! * Add a list entry to dictionary "d". + * Returns FAIL when out of memory and when key already exists. + */ + int +--- 7075,7081 ---- + } + + /* +! * Add a list entry to dictionary "d". + * Returns FAIL when out of memory and when key already exists. + */ + int +*************** +*** 7097,7102 **** +--- 7097,7103 ---- + dictitem_free(item); + return FAIL; + } ++ ++list->lv_refcount; + return OK; + } + +*** ../vim-7.3.004/src/testdir/Makefile 2010-08-15 21:57:29.000000000 +0200 +--- src/testdir/Makefile 2010-09-14 12:38:56.000000000 +0200 +*************** +*** 44,50 **** + $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) + + clean: +! -rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.pid* viminfo + + test1.out: test1.in + -rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo +--- 44,50 ---- + $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) + + clean: +! -rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.* viminfo + + test1.out: test1.in + -rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo +*** ../vim-7.3.004/src/testdir/test61.in 2010-08-15 21:57:29.000000000 +0200 +--- src/testdir/test61.in 2010-09-14 12:38:56.000000000 +0200 +*************** +*** 4,9 **** +--- 4,13 ---- + Also tests :earlier and :later. + + STARTTEST ++ :echo undotree().entries ++ ENDTEST ++ ++ STARTTEST + :" Delete three characters and undo + Gx:set ul=100 + x:set ul=100 +*** ../vim-7.3.004/src/version.c 2010-09-14 10:55:24.000000000 +0200 +--- src/version.c 2010-09-14 12:39:59.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 5, + /**/ + +-- +I'm writing a book. I've got the page numbers done. + + /// Bram Moolenaar -- [email protected] -- 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 /// ================================================================ Index: packages/vim/7.3.006 diff -u /dev/null packages/vim/7.3.006:1.1 --- /dev/null Tue Oct 5 09:23:53 2010 +++ packages/vim/7.3.006 Tue Oct 5 09:23:46 2010 @@ -0,0 +1,117 @@ +To: [email protected] +Subject: Patch 7.3.006 +Fcc: outbox +From: Bram Moolenaar <[email protected]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.006 +Problem: Can't build some multi-byte code with C89. +Solution: Move code to after declarations. (Joachim Schmitz) +Files: src/mbyte.c, src/spell.c + + +*** ../vim-7.3.005/src/mbyte.c 2010-08-15 21:57:28.000000000 +0200 +--- src/mbyte.c 2010-09-18 13:32:40.000000000 +0200 +*************** +*** 5167,5182 **** + void + xim_set_preedit() + { +- if (xic == NULL) +- return; +- +- xim_set_focus(TRUE); +- + XVaNestedList attr_list; + XRectangle spot_area; + XPoint over_spot; + int line_space; + + if (!xim_has_focus) + { + /* hide XIM cursor */ +--- 5167,5182 ---- + void + xim_set_preedit() + { + XVaNestedList attr_list; + XRectangle spot_area; + XPoint over_spot; + int line_space; + ++ if (xic == NULL) ++ return; ++ ++ xim_set_focus(TRUE); ++ + if (!xim_has_focus) + { + /* hide XIM cursor */ +*************** +*** 5554,5565 **** + void + xim_set_status_area() + { +- if (xic == NULL) +- return; +- + XVaNestedList preedit_list = 0, status_list = 0, list = 0; + XRectangle pre_area, status_area; + + if (input_style & XIMStatusArea) + { + if (input_style & XIMPreeditArea) +--- 5554,5565 ---- + void + xim_set_status_area() + { + XVaNestedList preedit_list = 0, status_list = 0, list = 0; + XRectangle pre_area, status_area; + ++ if (xic == NULL) ++ return; ++ + if (input_style & XIMStatusArea) + { + if (input_style & XIMPreeditArea) +*** ../vim-7.3.005/src/spell.c 2010-08-15 21:57:32.000000000 +0200 +--- src/spell.c 2010-09-18 13:34:11.000000000 +0200 +*************** +*** 4679,4685 **** + buf_T *buf; + char_u fname[MAXPATHL]; + +! /* Go through all buffers and handle 'spelllang'. */ //<VN> + for (buf = firstbuf; buf != NULL; buf = buf->b_next) + ga_clear(&buf->b_s.b_langp); + +--- 4679,4685 ---- + buf_T *buf; + char_u fname[MAXPATHL]; + +! /* Go through all buffers and handle 'spelllang'. <VN> */ + for (buf = firstbuf; buf != NULL; buf = buf->b_next) + ga_clear(&buf->b_s.b_langp); + +*** ../vim-7.3.005/src/version.c 2010-09-14 12:47:30.000000000 +0200 +--- src/version.c 2010-09-18 13:34:23.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 6, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +163. You go outside for the fresh air (at -30 degrees) but open the + window first to hear new mail arrive. + + /// Bram Moolenaar -- [email protected] -- 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 /// ================================================================ Index: packages/vim/7.3.007 diff -u /dev/null packages/vim/7.3.007:1.1 --- /dev/null Tue Oct 5 09:23:53 2010 +++ packages/vim/7.3.007 Tue Oct 5 09:23:46 2010 @@ -0,0 +1,187 @@ +To: [email protected] +Subject: Patch 7.3.007 +Fcc: outbox +From: Bram Moolenaar <[email protected]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.007 +Problem: Python code defines global "buffer". Re-implements a grow-array. +Solution: Use a grow-array instead of coding the same functionality. Handle + out-of-memory situation properly. +Files: src/if_py_both.h + + +*** ../vim-7.3.006/src/if_py_both.h 2010-08-15 21:57:27.000000000 +0200 +--- src/if_py_both.h 2010-09-21 16:00:54.000000000 +0200 +*************** +*** 34,39 **** +--- 34,40 ---- + static PyObject *OutputWrite(PyObject *, PyObject *); + static PyObject *OutputWritelines(PyObject *, PyObject *); + ++ /* Function to write a line, points to either msg() or emsg(). */ + typedef void (*writefn)(char_u *); + static void writer(writefn fn, char_u *str, PyInt n); + +*************** +*** 122,173 **** + return Py_None; + } + +! static char_u *buffer = NULL; +! static PyInt buffer_len = 0; +! static PyInt buffer_size = 0; +! + static writefn old_fn = NULL; + + static void +- buffer_ensure(PyInt n) +- { +- PyInt new_size; +- char_u *new_buffer; +- +- if (n < buffer_size) +- return; +- +- new_size = buffer_size; +- while (new_size < n) +- new_size += 80; +- +- if (new_size != buffer_size) +- { +- new_buffer = alloc((unsigned)new_size); +- if (new_buffer == NULL) +- return; +- +- if (buffer) +- { +- memcpy(new_buffer, buffer, buffer_len); +- vim_free(buffer); +- } +- +- buffer = new_buffer; +- buffer_size = new_size; +- } +- } +- +- static void + PythonIO_Flush(void) + { +! if (old_fn && buffer_len) + { +! buffer[buffer_len] = 0; +! old_fn(buffer); + } +! +! buffer_len = 0; + } + + static void +--- 123,141 ---- + return Py_None; + } + +! /* Buffer IO, we write one whole line at a time. */ +! static garray_T io_ga = {0, 0, 1, 80, NULL}; + static writefn old_fn = NULL; + + static void + PythonIO_Flush(void) + { +! if (old_fn != NULL && io_ga.ga_len > 0) + { +! ((char_u *)io_ga.ga_data)[io_ga.ga_len] = NUL; +! old_fn((char_u *)io_ga.ga_data); + } +! io_ga.ga_len = 0; + } + + static void +*************** +*** 175,204 **** + { + char_u *ptr; + +! if (fn != old_fn && old_fn != NULL) + PythonIO_Flush(); +- + old_fn = fn; + + while (n > 0 && (ptr = memchr(str, '\n', n)) != NULL) + { + PyInt len = ptr - str; + +! buffer_ensure(buffer_len + len + 1); + +! memcpy(buffer + buffer_len, str, len); +! buffer_len += len; +! buffer[buffer_len] = 0; +! fn(buffer); + str = ptr + 1; + n -= len + 1; +! buffer_len = 0; + } + +! /* Put the remaining text into the buffer for later printing */ +! buffer_ensure(buffer_len + n + 1); +! memcpy(buffer + buffer_len, str, n); +! buffer_len += n; + } + + /***************/ +--- 143,176 ---- + { + char_u *ptr; + +! /* Flush when switching output function. */ +! if (fn != old_fn) + PythonIO_Flush(); + old_fn = fn; + ++ /* Write each NL separated line. Text after the last NL is kept for ++ * writing later. */ + while (n > 0 && (ptr = memchr(str, '\n', n)) != NULL) + { + PyInt len = ptr - str; + +! if (ga_grow(&io_ga, len + 1) == FAIL) +! break; + +! mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len); +! ((char *)io_ga.ga_data)[io_ga.ga_len + len] = NUL; +! fn((char_u *)io_ga.ga_data); + str = ptr + 1; + n -= len + 1; +! io_ga.ga_len = 0; + } + +! /* Put the remaining text into io_ga for later printing. */ +! if (n > 0 && ga_grow(&io_ga, n + 1) == OK) +! { +! mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n); +! io_ga.ga_len += n; +! } + } + + /***************/ +*** ../vim-7.3.006/src/version.c 2010-09-18 13:36:41.000000000 +0200 +--- src/version.c 2010-09-21 16:49:13.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 7, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +180. You maintain more than six e-mail addresses. + + /// Bram Moolenaar -- [email protected] -- 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 /// ================================================================ Index: packages/vim/7.3.008 diff -u /dev/null packages/vim/7.3.008:1.1 --- /dev/null Tue Oct 5 09:23:53 2010 +++ packages/vim/7.3.008 Tue Oct 5 09:23:46 2010 @@ -0,0 +1,439 @@ +To: [email protected] +Subject: Patch 7.3.008 +Fcc: outbox +From: Bram Moolenaar <[email protected]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.008 +Problem: 'cursorbind' is kept in places where 'scrollbind' is reset. +Solution: Reset 'cursorbind'. +Files: src/buffer.c, src/diff.c, src/ex_cmds.c, src/ex_cmds2.c, + src/ex_docmd.c, src/ex_getln.c, src/if_cscope.c, src/macros.h, + src/quickfix.c, src/search.c, src/tag.c, src/window.c + + +*** ../vim-7.3.007/src/buffer.c 2010-08-15 21:57:32.000000000 +0200 +--- src/buffer.c 2010-09-21 16:54:19.000000000 +0200 +*************** +*** 1288,1296 **** + /* Go to the other buffer. */ + set_curbuf(buf, action); + +! #if defined(FEAT_LISTCMDS) && defined(FEAT_SCROLLBIND) + if (action == DOBUF_SPLIT) +! curwin->w_p_scb = FALSE; /* reset 'scrollbind' */ + #endif + + #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) +--- 1288,1299 ---- + /* Go to the other buffer. */ + set_curbuf(buf, action); + +! #if defined(FEAT_LISTCMDS) \ +! && (defined(FEAT_SCROLLBIND) || defined(FEAT_CURSORBIND)) + if (action == DOBUF_SPLIT) +! { +! RESET_BINDING(curwin); /* reset 'scrollbind' and 'cursorbind' */ +! } + #endif + + #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) +*************** +*** 1917,1925 **** + tabpage_new(); + else if (win_split(0, 0) == FAIL) /* Open in a new window */ + return FAIL; +! # ifdef FEAT_SCROLLBIND +! curwin->w_p_scb = FALSE; +! # endif + } + } + #endif +--- 1920,1926 ---- + tabpage_new(); + else if (win_split(0, 0) == FAIL) /* Open in a new window */ + return FAIL; +! RESET_BINDING(curwin); + } + } + #endif +*** ../vim-7.3.007/src/diff.c 2010-08-15 21:57:32.000000000 +0200 +--- src/diff.c 2010-09-21 16:14:07.000000000 +0200 +*************** +*** 1127,1137 **** + # endif + + wp->w_p_diff = TRUE; + #ifdef FEAT_CURSORBIND +- /* Use cursorbind if it's available */ + wp->w_p_crb = TRUE; + #endif +- wp->w_p_scb = TRUE; + wp->w_p_wrap = FALSE; + # ifdef FEAT_FOLDING + curwin = wp; +--- 1127,1139 ---- + # endif + + wp->w_p_diff = TRUE; ++ /* Use 'scrollbind' and 'cursorbind' when available */ ++ #ifdef FEAT_SCROLLBIND ++ wp->w_p_scb = TRUE; ++ #endif + #ifdef FEAT_CURSORBIND + wp->w_p_crb = TRUE; + #endif + wp->w_p_wrap = FALSE; + # ifdef FEAT_FOLDING + curwin = wp; +*************** +*** 1177,1186 **** + { + /* Set 'diff', 'scrollbind' off and 'wrap' on. */ + wp->w_p_diff = FALSE; +! #ifdef FEAT_CURSORBIND +! wp->w_p_crb = FALSE; +! #endif <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.526&r2=1.527&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
