Author: adamg Date: Sun Jul 4 07:20:32 2010 GMT Module: packages Tag: HEAD ---- Log message: - new
---- Files affected: packages/vim: 7.2.437 (NONE -> 1.1) (NEW), 7.2.438 (NONE -> 1.1) (NEW), 7.2.439 (NONE -> 1.1) (NEW), 7.2.440 (NONE -> 1.1) (NEW), 7.2.441 (NONE -> 1.1) (NEW), 7.2.442 (NONE -> 1.1) (NEW), 7.2.443 (NONE -> 1.1) (NEW), 7.2.444 (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/vim/7.2.437 diff -u /dev/null packages/vim/7.2.437:1.1 --- /dev/null Sun Jul 4 09:20:32 2010 +++ packages/vim/7.2.437 Sun Jul 4 09:20:26 2010 @@ -0,0 +1,53 @@ +To: [email protected] +Subject: Patch 7.2.437 +Fcc: outbox +From: Bram Moolenaar <[email protected]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.437 (after 7.2.407) +Problem: When "\\\n" appears in the expression result the \n doesn't result + in a line break. (Andy Wokula) +Solution: Also replace a \n after a backslash into \r. +Files: src/regexp.c + + +*** ../vim-7.2.436/src/regexp.c 2010-03-23 16:27:15.000000000 +0100 +--- src/regexp.c 2010-05-21 13:06:00.000000000 +0200 +*************** +*** 6974,6979 **** +--- 6974,6986 ---- + else if (*s == '\\' && s[1] != NUL) + { + ++s; ++ /* Change NL to CR here too, so that this works: ++ * :s/abc\\\ndef/\="aaa\\\nbbb"/ on text: ++ * abc\ ++ * def ++ */ ++ if (*s == NL) ++ *s = CAR; + had_backslash = TRUE; + } + } +*** ../vim-7.2.436/src/version.c 2010-05-16 13:56:01.000000000 +0200 +--- src/version.c 2010-05-21 13:07:50.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 437, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +89. In addition to your e-mail address being on your business + cards you even have your own domain. + + /// 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.2.438 diff -u /dev/null packages/vim/7.2.438:1.1 --- /dev/null Sun Jul 4 09:20:32 2010 +++ packages/vim/7.2.438 Sun Jul 4 09:20:26 2010 @@ -0,0 +1,74 @@ +To: [email protected] +Subject: Patch 7.2.438 +Fcc: outbox +From: Bram Moolenaar <[email protected]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.438 (after 7.2.427) +Problem: "vim -r" crashes. +Solution: Don't use NULL pointer argument. +Files: src/memline.c + + +*** ../vim-7.2.437/src/memline.c 2010-05-14 17:52:35.000000000 +0200 +--- src/memline.c 2010-05-25 21:36:01.000000000 +0200 +*************** +*** 1404,1418 **** + int i; + char_u *dirp; + char_u *dir_name; +! char_u *fname_res = *fname; + #ifdef HAVE_READLINK + char_u fname_buf[MAXPATHL]; + + /* Expand symlink in the file name, because the swap file is created with + * the actual file instead of with the symlink. */ + if (resolve_symlink(*fname, fname_buf) == OK) + fname_res = fname_buf; + #endif + + if (list) + { +--- 1404,1425 ---- + int i; + char_u *dirp; + char_u *dir_name; +! char_u *fname_res = NULL; + #ifdef HAVE_READLINK + char_u fname_buf[MAXPATHL]; ++ #endif + ++ if (fname != NULL) ++ { ++ #ifdef HAVE_READLINK + /* Expand symlink in the file name, because the swap file is created with + * the actual file instead of with the symlink. */ + if (resolve_symlink(*fname, fname_buf) == OK) + fname_res = fname_buf; ++ else + #endif ++ fname_res = *fname; ++ } + + if (list) + { +*** ../vim-7.2.437/src/version.c 2010-05-21 13:08:51.000000000 +0200 +--- src/version.c 2010-05-25 21:30:12.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 438, + /**/ + +-- +A fool learns from his mistakes, a wise man from someone else's. + + /// 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.2.439 diff -u /dev/null packages/vim/7.2.439:1.1 --- /dev/null Sun Jul 4 09:20:32 2010 +++ packages/vim/7.2.439 Sun Jul 4 09:20:26 2010 @@ -0,0 +1,111 @@ +To: [email protected] +Subject: Patch 7.2.439 +Fcc: outbox +From: Bram Moolenaar <[email protected]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.439 +Problem: Invalid memory access when doing thesaurus completion and + 'infercase' is set. +Solution: Use the minimal length of completed word and replacement. + (Dominique Pelle) +Files: src/edit.c + + +*** ../vim-7.2.438/src/edit.c 2010-03-10 14:15:28.000000000 +0100 +--- src/edit.c 2010-05-28 21:20:29.000000000 +0200 +*************** +*** 2164,2169 **** +--- 2164,2170 ---- + int i, c; + int actual_len; /* Take multi-byte characters */ + int actual_compl_length; /* into account. */ ++ int min_len; + int *wca; /* Wide character array. */ + int has_lower = FALSE; + int was_letter = FALSE; +*************** +*** 2204,2209 **** +--- 2205,2215 ---- + #endif + actual_compl_length = compl_length; + ++ /* "actual_len" may be smaller than "actual_compl_length" when using ++ * thesaurus, only use the minimum when comparing. */ ++ min_len = actual_len < actual_compl_length ++ ? actual_len : actual_compl_length; ++ + /* Allocate wide character array for the completion and fill it. */ + wca = (int *)alloc((unsigned)(actual_len * sizeof(int))); + if (wca != NULL) +*************** +*** 2219,2225 **** + + /* Rule 1: Were any chars converted to lower? */ + p = compl_orig_text; +! for (i = 0; i < actual_compl_length; ++i) + { + #ifdef FEAT_MBYTE + if (has_mbyte) +--- 2225,2231 ---- + + /* Rule 1: Were any chars converted to lower? */ + p = compl_orig_text; +! for (i = 0; i < min_len; ++i) + { + #ifdef FEAT_MBYTE + if (has_mbyte) +*************** +*** 2247,2253 **** + if (!has_lower) + { + p = compl_orig_text; +! for (i = 0; i < actual_compl_length; ++i) + { + #ifdef FEAT_MBYTE + if (has_mbyte) +--- 2253,2259 ---- + if (!has_lower) + { + p = compl_orig_text; +! for (i = 0; i < min_len; ++i) + { + #ifdef FEAT_MBYTE + if (has_mbyte) +*************** +*** 2268,2274 **** + + /* Copy the original case of the part we typed. */ + p = compl_orig_text; +! for (i = 0; i < actual_compl_length; ++i) + { + #ifdef FEAT_MBYTE + if (has_mbyte) +--- 2274,2280 ---- + + /* Copy the original case of the part we typed. */ + p = compl_orig_text; +! for (i = 0; i < min_len; ++i) + { + #ifdef FEAT_MBYTE + if (has_mbyte) +*** ../vim-7.2.438/src/version.c 2010-05-25 21:37:12.000000000 +0200 +--- src/version.c 2010-05-28 21:30:53.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 439, + /**/ + +-- +Corduroy pillows: They're making headlines! + + /// 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.2.440 diff -u /dev/null packages/vim/7.2.440:1.1 --- /dev/null Sun Jul 4 09:20:32 2010 +++ packages/vim/7.2.440 Sun Jul 4 09:20:26 2010 @@ -0,0 +1,180 @@ +To: [email protected] +Subject: Patch 7.2.440 +Fcc: outbox +From: Bram Moolenaar <[email protected]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.440 +Problem: Calling a function through a funcref, where the function deletes + the funcref, leads to an invalid memory access. +Solution: Make a copy of the function name. (Lech Lorens) +Files: src/eval.c, src/testdir/test34.in, src/testdir/test34.ok + + +*** ../vim-7.2.439/src/eval.c 2010-05-16 13:26:19.000000000 +0200 +--- src/eval.c 2010-05-28 22:01:07.000000000 +0200 +*************** +*** 464,470 **** + static int find_internal_func __ARGS((char_u *name)); + static char_u *deref_func_name __ARGS((char_u *name, int *lenp)); + static int get_func_tv __ARGS((char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict)); +! static int call_func __ARGS((char_u *name, int len, typval_T *rettv, int argcount, typval_T *argvars, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict)); + static void emsg_funcname __ARGS((char *ermsg, char_u *name)); + static int non_zero_arg __ARGS((typval_T *argvars)); + +--- 464,470 ---- + static int find_internal_func __ARGS((char_u *name)); + static char_u *deref_func_name __ARGS((char_u *name, int *lenp)); + static int get_func_tv __ARGS((char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict)); +! static int call_func __ARGS((char_u *func_name, int len, typval_T *rettv, int argcount, typval_T *argvars, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict)); + static void emsg_funcname __ARGS((char *ermsg, char_u *name)); + static int non_zero_arg __ARGS((typval_T *argvars)); + +*************** +*** 7997,8005 **** + * Also returns OK when an error was encountered while executing the function. + */ + static int +! call_func(name, len, rettv, argcount, argvars, firstline, lastline, + doesrange, evaluate, selfdict) +! char_u *name; /* name of the function */ + int len; /* length of "name" */ + typval_T *rettv; /* return value goes here */ + int argcount; /* number of "argvars" */ +--- 7997,8005 ---- + * Also returns OK when an error was encountered while executing the function. + */ + static int +! call_func(func_name, len, rettv, argcount, argvars, firstline, lastline, + doesrange, evaluate, selfdict) +! char_u *func_name; /* name of the function */ + int len; /* length of "name" */ + typval_T *rettv; /* return value goes here */ + int argcount; /* number of "argvars" */ +*************** +*** 8023,8040 **** + int i; + int llen; + ufunc_T *fp; +- int cc; + #define FLEN_FIXED 40 + char_u fname_buf[FLEN_FIXED + 1]; + char_u *fname; + + /* + * In a script change <SID>name() and s:name() to K_SNR 123_name(). + * Change <SNR>123_name() to K_SNR 123_name(). + * Use fname_buf[] when it fits, otherwise allocate memory (slow). + */ +- cc = name[len]; +- name[len] = NUL; + llen = eval_fname_script(name); + if (llen > 0) + { +--- 8023,8044 ---- + int i; + int llen; + ufunc_T *fp; + #define FLEN_FIXED 40 + char_u fname_buf[FLEN_FIXED + 1]; + char_u *fname; ++ char_u *name; ++ ++ /* Make a copy of the name, if it comes from a funcref variable it could ++ * be changed or deleted in the called function. */ ++ name = vim_strnsave(func_name, len); ++ if (name == NULL) ++ return ret; + + /* + * In a script change <SID>name() and s:name() to K_SNR 123_name(). + * Change <SNR>123_name() to K_SNR 123_name(). + * Use fname_buf[] when it fits, otherwise allocate memory (slow). + */ + llen = eval_fname_script(name); + if (llen > 0) + { +*************** +*** 8205,8213 **** + } + } + +- name[len] = cc; + if (fname != name && fname != fname_buf) + vim_free(fname); + + return ret; + } +--- 8209,8217 ---- + } + } + + if (fname != name && fname != fname_buf) + vim_free(fname); ++ vim_free(name); + + return ret; + } +*** ../vim-7.2.439/src/testdir/test34.in 2007-09-25 17:59:15.000000000 +0200 +--- src/testdir/test34.in 2010-05-28 21:54:36.000000000 +0200 +*************** +*** 35,40 **** +--- 35,45 ---- + : let g:counter = 0 + : return '' + :endfunc ++ :func FuncWithRef(a) ++ : unlet g:FuncRef ++ : return a:a ++ :endfunc ++ :let g:FuncRef=function("FuncWithRef") + :let counter = 0 + :inoremap <expr> ( ListItem() + :inoremap <expr> [ ListReset() +*************** +*** 47,52 **** +--- 52,58 ---- + =retval + =Compute(45, 5, "retval") + =retval ++ =g:FuncRef(333) + + XX+-XX + ---*--- +*** ../vim-7.2.439/src/testdir/test34.ok 2006-04-30 20:49:40.000000000 +0200 +--- src/testdir/test34.ok 2010-05-28 21:56:03.000000000 +0200 +*************** +*** 1,4 **** +! xxx4asdf fail nop ok 9 + XX111XX + ---222--- + 1. one +--- 1,4 ---- +! xxx4asdf fail nop ok 9 333 + XX111XX + ---222--- + 1. one +*** ../vim-7.2.439/src/version.c 2010-05-28 21:31:51.000000000 +0200 +--- src/version.c 2010-05-28 22:03:30.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 440, + /**/ + +-- +Nobody will ever need more than 640 kB RAM. + -- Bill Gates, 1983 +Windows 98 requires 16 MB RAM. + -- Bill Gates, 1999 +Logical conclusion: Nobody will ever need Windows 98. + + /// 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.2.441 diff -u /dev/null packages/vim/7.2.441:1.1 --- /dev/null Sun Jul 4 09:20:32 2010 +++ packages/vim/7.2.441 Sun Jul 4 09:20:26 2010 @@ -0,0 +1,141 @@ +To: [email protected] +Subject: Patch 7.2.441 +Fcc: outbox +From: Bram Moolenaar <[email protected]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.441 +Problem: When using ":earlier" undo information may be wrong. +Solution: When changing alternate branches also adjust b_u_oldhead. +Files: src/undo.c + + +*** ../vim-7.2.440/src/undo.c 2008-02-13 15:21:29.000000000 +0100 +--- src/undo.c 2010-05-30 16:52:47.000000000 +0200 +*************** +*** 242,248 **** + } + + /* +! * save the line "lnum" (used by ":s" and "~" command) + * The line is replaced, so the new bottom line is lnum + 1. + */ + int +--- 242,248 ---- + } + + /* +! * Save the line "lnum" (used by ":s" and "~" command). + * The line is replaced, so the new bottom line is lnum + 1. + */ + int +*************** +*** 256,262 **** + } + + /* +! * a new line is inserted before line "lnum" (used by :s command) + * The line is inserted, so the new bottom line is lnum + 1. + */ + int +--- 256,262 ---- + } + + /* +! * A new line is inserted before line "lnum" (used by :s command). + * The line is inserted, so the new bottom line is lnum + 1. + */ + int +*************** +*** 270,276 **** + } + + /* +! * save the lines "lnum" - "lnum" + nlines (used by delete command) + * The lines are deleted, so the new bottom line is lnum, unless the buffer + * becomes empty. + */ +--- 270,276 ---- + } + + /* +! * Save the lines "lnum" - "lnum" + nlines (used by delete command). + * The lines are deleted, so the new bottom line is lnum, unless the buffer + * becomes empty. + */ +*************** +*** 996,1001 **** +--- 996,1003 ---- + last->uh_alt_next = uhp; + uhp->uh_alt_prev = last; + ++ if (curbuf->b_u_oldhead == uhp) ++ curbuf->b_u_oldhead = last; + uhp = last; + if (uhp->uh_next != NULL) + uhp->uh_next->uh_prev = uhp; +*************** +*** 1406,1415 **** + /* + * ":undolist": List the leafs of the undo tree + */ +- /*ARGSUSED*/ + void + ex_undolist(eap) +! exarg_T *eap; + { + garray_T ga; + u_header_T *uhp; +--- 1408,1416 ---- + /* + * ":undolist": List the leafs of the undo tree + */ + void + ex_undolist(eap) +! exarg_T *eap UNUSED; + { + garray_T ga; + u_header_T *uhp; +*************** +*** 1529,1538 **** + /* + * ":undojoin": continue adding to the last entry list + */ +- /*ARGSUSED*/ + void + ex_undojoin(eap) +! exarg_T *eap; + { + if (curbuf->b_u_newhead == NULL) + return; /* nothing changed before */ +--- 1530,1538 ---- + /* + * ":undojoin": continue adding to the last entry list + */ + void + ex_undojoin(eap) +! exarg_T *eap UNUSED; + { + if (curbuf->b_u_newhead == NULL) + return; /* nothing changed before */ +*** ../vim-7.2.440/src/version.c 2010-05-28 22:06:41.000000000 +0200 +--- src/version.c 2010-05-30 16:53:56.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 441, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +127. You bring your laptop and cellular phone to church. + + /// 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.2.442 diff -u /dev/null packages/vim/7.2.442:1.1 --- /dev/null Sun Jul 4 09:20:32 2010 +++ packages/vim/7.2.442 Sun Jul 4 09:20:26 2010 @@ -0,0 +1,256 @@ +To: [email protected] +Subject: Patch 7.2.442 <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
