Author: glen Date: Tue Jan 23 16:27:04 2007 GMT Module: SOURCES Tag: HEAD ---- Log message: - from upstream
---- Files affected: SOURCES: 7.0.179 (NONE -> 1.1) (NEW), 7.0.180 (NONE -> 1.1) (NEW), 7.0.181 (NONE -> 1.1) (NEW), 7.0.182 (NONE -> 1.1) (NEW), 7.0.183 (NONE -> 1.1) (NEW), 7.0.184 (NONE -> 1.1) (NEW), 7.0.185 (NONE -> 1.1) (NEW), 7.0.186 (NONE -> 1.1) (NEW), 7.0.187 (NONE -> 1.1) (NEW), 7.0.188 (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/7.0.179 diff -u /dev/null SOURCES/7.0.179:1.1 --- /dev/null Tue Jan 23 17:27:04 2007 +++ SOURCES/7.0.179 Tue Jan 23 17:26:59 2007 @@ -0,0 +1,57 @@ +To: [email protected] +Subject: patch 7.0.179 +Fcc: outbox +From: Bram Moolenaar <[EMAIL PROTECTED]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.179 +Problem: Using ":recover" or "vim -r" without a swapfile crashes Vim. +Solution: Check for "buf" to be unequal NULL. (Yukihiro Nakadaira) +Files: src/memline.c + + +*** ../vim-7.0.178/src/memline.c Tue Nov 21 20:57:21 2006 +--- src/memline.c Tue Jan 9 14:33:44 2007 +*************** +*** 1329,1336 **** + mf_put(mfp, hp, FALSE, FALSE); + mf_close(mfp, FALSE); /* will also vim_free(mfp->mf_fname) */ + } +! vim_free(buf->b_ml.ml_stack); +! vim_free(buf); + if (serious_error && called_from_main) + ml_close(curbuf, TRUE); + #ifdef FEAT_AUTOCMD +--- 1329,1339 ---- + mf_put(mfp, hp, FALSE, FALSE); + mf_close(mfp, FALSE); /* will also vim_free(mfp->mf_fname) */ + } +! if (buf != NULL) +! { +! vim_free(buf->b_ml.ml_stack); +! vim_free(buf); +! } + if (serious_error && called_from_main) + ml_close(curbuf, TRUE); + #ifdef FEAT_AUTOCMD +*** ../vim-7.0.178/src/version.c Tue Dec 5 22:09:02 2006 +--- src/version.c Tue Jan 9 14:35:59 2007 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 179, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +10. And even your night dreams are in HTML. + + /// 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: SOURCES/7.0.180 diff -u /dev/null SOURCES/7.0.180:1.1 --- /dev/null Tue Jan 23 17:27:04 2007 +++ SOURCES/7.0.180 Tue Jan 23 17:26:59 2007 @@ -0,0 +1,101 @@ +To: [email protected] +Subject: patch 7.0.180 (extra) +Fcc: outbox +From: Bram Moolenaar <[EMAIL PROTECTED]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.180 (extra, after 7.0.171) +Problem: VMS: build failed. Problem with swapfiles. +Solution: Add "compiled_arch". Always expand path and pass it to + buf_modname(). (Zoltan Arpadffy) +Files: src/globals.h, src/memline.c, src/os_unix.c, runtime/menu.vim + + +*** ../vim-7.0.179/src/globals.h Sat Oct 14 14:33:21 2006 +--- src/globals.h Tue Jan 9 14:26:51 2007 +*************** +*** 1092,1097 **** +--- 1092,1098 ---- + extern char_u *all_lflags; + # ifdef VMS + extern char_u *compiler_version; ++ extern char_u *compiled_arch; + # endif + extern char_u *compiled_user; + extern char_u *compiled_sys; +*** ../vim-7.0.179/src/memline.c Tue Jan 9 14:37:10 2007 +--- src/memline.c Tue Jan 9 14:33:44 2007 +*************** +*** 3572,3579 **** + #else + (buf->b_p_sn || buf->b_shortname), + #endif +! #ifdef RISCOS +! /* Avoid problems if fname has special chars, eg <Wimp$Scrap> */ + ffname, + #else + # ifdef HAVE_READLINK +--- 3572,3580 ---- + #else + (buf->b_p_sn || buf->b_shortname), + #endif +! #if defined(VMS) || defined(RISCOS) +! /* Avoid problems if fname has special chars, eg <Wimp$Scrap>. +! * For VMS always use full path for swapfile. */ + ffname, + #else + # ifdef HAVE_READLINK +*** ../vim-7.0.179/src/os_unix.c Tue Nov 28 17:44:51 2006 +--- src/os_unix.c Tue Jan 9 14:31:08 2007 +*************** +*** 2221,2227 **** + * behaviour should be avoided for the existing files and we need to find + * the exact path of the edited file. + */ +- if (force || !mch_isFullName(fname)) + { + char_u *fixed_fname = vms_fixfilename(fname); + int fd = mch_open((char *)fixed_fname, O_RDONLY | O_EXTRA, 0); +--- 2221,2226 ---- +*** ../vim-7.0.179/runtime/menu.vim Thu Sep 14 13:35:17 2006 +--- runtime/menu.vim Tue Jan 9 14:31:40 2007 +*************** +*** 384,390 **** + " Programming menu + if !exists("g:ctags_command") + if has("vms") +! let g:ctags_command = "mc vim:ctags ." + else + let g:ctags_command = "ctags -R ." + endif +--- 384,390 ---- + " Programming menu + if !exists("g:ctags_command") + if has("vms") +! let g:ctags_command = "mc vim:ctags *.*" + else + let g:ctags_command = "ctags -R ." + endif +*** ../vim-7.0.179/src/version.c Tue Jan 9 14:37:10 2007 +--- src/version.c Tue Jan 9 15:00:57 2007 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 180, + /**/ + +-- +The Feynman problem solving Algorithm: + 1) Write down the problem + 2) Think real hard + 3) Write down the answer + + /// 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: SOURCES/7.0.181 diff -u /dev/null SOURCES/7.0.181:1.1 --- /dev/null Tue Jan 23 17:27:04 2007 +++ SOURCES/7.0.181 Tue Jan 23 17:26:59 2007 @@ -0,0 +1,56 @@ +To: [email protected] +Subject: patch 7.0.181 +Fcc: outbox +From: Bram Moolenaar <[EMAIL PROTECTED]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.181 +Problem: When reloading a file that starts with an empty line, the reloaded + buffer has an extra empty line at the end. (Motty Lentzitzky) +Solution: Delete all lines, don't use bufempty(). +Files: src/fileio.c + + +*** ../vim-7.0.180/src/fileio.c Thu Oct 12 21:15:04 2006 +--- src/fileio.c Tue Jan 9 15:38:13 2007 +*************** +*** 6178,6185 **** + if (retval != FAIL) + { + curbuf = frombuf; +! while (!bufempty()) +! if (ml_delete(curbuf->b_ml.ml_line_count, FALSE) == FAIL) + { + /* Oops! We could try putting back the saved lines, but that + * might fail again... */ +--- 6179,6186 ---- + if (retval != FAIL) + { + curbuf = frombuf; +! for (lnum = curbuf->b_ml.ml_line_count; lnum > 0; --lnum) +! if (ml_delete(lnum, FALSE) == FAIL) + { + /* Oops! We could try putting back the saved lines, but that + * might fail again... */ +*** ../vim-7.0.180/src/version.c Tue Jan 9 15:15:36 2007 +--- src/version.c Tue Jan 9 15:41:55 2007 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 181, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +11. You find yourself typing "com" after every period when using a word + processor.com + + /// 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: SOURCES/7.0.182 diff -u /dev/null SOURCES/7.0.182:1.1 --- /dev/null Tue Jan 23 17:27:04 2007 +++ SOURCES/7.0.182 Tue Jan 23 17:26:59 2007 @@ -0,0 +1,90 @@ +To: [email protected] +Subject: patch 7.0.182 +Fcc: outbox +From: Bram Moolenaar <[EMAIL PROTECTED]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.182 +Problem: When using a mix of undo and "g-" it may no longer be possible to + go to every point in the undo tree. (Andy Wokula) +Solution: Correctly update pointers in the undo tree. +Files: src/undo.c + + +*** ../vim-7.0.181/src/undo.c Tue Aug 29 17:28:56 2006 +--- src/undo.c Tue Jan 9 20:18:27 2007 +*************** +*** 341,351 **** + uhp->uh_alt_next = old_curhead; + if (old_curhead != NULL) + { + old_curhead->uh_alt_prev = uhp; + if (curbuf->b_u_oldhead == old_curhead) + curbuf->b_u_oldhead = uhp; + } +! uhp->uh_alt_prev = NULL; + if (curbuf->b_u_newhead != NULL) + curbuf->b_u_newhead->uh_prev = uhp; + +--- 341,355 ---- + uhp->uh_alt_next = old_curhead; + if (old_curhead != NULL) + { ++ uhp->uh_alt_prev = old_curhead->uh_alt_prev; ++ if (uhp->uh_alt_prev != NULL) ++ uhp->uh_alt_prev->uh_alt_next = uhp; + old_curhead->uh_alt_prev = uhp; + if (curbuf->b_u_oldhead == old_curhead) + curbuf->b_u_oldhead = uhp; + } +! else +! uhp->uh_alt_prev = NULL; + if (curbuf->b_u_newhead != NULL) + curbuf->b_u_newhead->uh_prev = uhp; + +*************** +*** 856,861 **** +--- 860,870 ---- + uhp = curbuf->b_u_curhead; + while (uhp != NULL) + { ++ /* Go back to the first branch with a mark. */ ++ while (uhp->uh_alt_prev != NULL ++ && uhp->uh_alt_prev->uh_walk == mark) ++ uhp = uhp->uh_alt_prev; ++ + /* Find the last branch with a mark, that's the one. */ + last = uhp; + while (last->uh_alt_next != NULL +*************** +*** 865,870 **** +--- 874,881 ---- + { + /* Make the used branch the first entry in the list of + * alternatives to make "u" and CTRL-R take this branch. */ ++ while (uhp->uh_alt_prev != NULL) ++ uhp = uhp->uh_alt_prev; + if (last->uh_alt_next != NULL) + last->uh_alt_next->uh_alt_prev = last->uh_alt_prev; + last->uh_alt_prev->uh_alt_next = last->uh_alt_next; +*** ../vim-7.0.181/src/version.c Tue Jan 9 15:43:39 2007 +--- src/version.c Tue Jan 9 20:26:47 2007 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 182, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +13. You refer to going to the bathroom as downloading. + + /// 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: SOURCES/7.0.183 diff -u /dev/null SOURCES/7.0.183:1.1 --- /dev/null Tue Jan 23 17:27:04 2007 +++ SOURCES/7.0.183 Tue Jan 23 17:26:59 2007 @@ -0,0 +1,163 @@ +To: [email protected] +Subject: patch 7.0.183 +Fcc: outbox +From: Bram Moolenaar <[EMAIL PROTECTED]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.183 +Problem: Crash in ":let" when redirecting to a variable that's being + displayed. (Thomas Link) +Solution: When redirecting to a variable only do the assignment when + stopping redirection to avoid that setting the variable causes a + freed string to be accessed. +Files: src/eval.c + + +*** ../vim-7.0.182/src/eval.c Tue Dec 5 10:33:57 2006 +--- src/eval.c Sun Jan 14 14:20:49 2007 +*************** +*** 898,903 **** +--- 898,904 ---- + } + + static lval_T *redir_lval = NULL; ++ static garray_T redir_ga; /* only valid when redir_lval is not NULL */ + static char_u *redir_endp = NULL; + static char_u *redir_varname = NULL; + +*************** +*** 932,937 **** +--- 933,941 ---- + return FAIL; + } + ++ /* The output is stored in growarray "redir_ga" until redirection ends. */ ++ ga_init2(&redir_ga, (int)sizeof(char), 500); ++ + /* Parse the variable name (can be a dict or list entry). */ + redir_endp = get_lval(redir_varname, NULL, redir_lval, FALSE, FALSE, FALSE, + FNE_CHECK_START); +*************** +*** 974,1015 **** + } + + /* +! * Append "value[len]" to the variable set by var_redir_start(). + */ + void +! var_redir_str(value, len) + char_u *value; +! int len; + { +! char_u *val; +! typval_T tv; +! int save_emsg; +! int err; + + if (redir_lval == NULL) + return; + +! if (len == -1) +! /* Append the entire string */ +! val = vim_strsave(value); +! else +! /* Append only the specified number of characters */ +! val = vim_strnsave(value, len); +! if (val == NULL) +! return; +! +! tv.v_type = VAR_STRING; +! tv.vval.v_string = val; + +! save_emsg = did_emsg; +! did_emsg = FALSE; +! set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)"."); +! err = did_emsg; +! did_emsg |= save_emsg; +! if (err) + var_redir_stop(); +- +- vim_free(tv.vval.v_string); + } + + /* +--- 978,1013 ---- + } + + /* +! * Append "value[value_len]" to the variable set by var_redir_start(). +! * The actual appending is postponed until redirection ends, because the value +! * appended may in fact be the string we write to, changing it may cause freed +! * memory to be used: +! * :redir => foo +! * :let foo +! * :redir END + */ + void +! var_redir_str(value, value_len) + char_u *value; +! int value_len; + { +! size_t len; + + if (redir_lval == NULL) + return; + +! if (value_len == -1) +! len = STRLEN(value); /* Append the entire string */ +! else +! len = value_len; /* Append only "value_len" characters */ + +! if (ga_grow(&redir_ga, (int)len) == OK) +! { +! mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len); +! redir_ga.ga_len += len; +! } +! else + var_redir_stop(); + } + + /* +*************** +*** 1018,1025 **** +--- 1016,1034 ---- + void + var_redir_stop() + { ++ typval_T tv; ++ + if (redir_lval != NULL) + { ++ /* Append the trailing NUL. */ ++ ga_append(&redir_ga, NUL); ++ ++ /* Assign the text to the variable. */ ++ tv.v_type = VAR_STRING; ++ tv.vval.v_string = redir_ga.ga_data; ++ set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)"."); ++ vim_free(tv.vval.v_string); ++ + clear_lval(redir_lval); + vim_free(redir_lval); + redir_lval = NULL; +*** ../vim-7.0.182/src/version.c Tue Jan 9 20:29:55 2007 +--- src/version.c Sun Jan 14 15:23:23 2007 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 183, + /**/ + +-- +How To Keep A Healthy Level Of Insanity: +16. Have your coworkers address you by your wrestling name, Rock Hard Kim. + + /// 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: SOURCES/7.0.184 diff -u /dev/null SOURCES/7.0.184:1.1 --- /dev/null Tue Jan 23 17:27:04 2007 +++ SOURCES/7.0.184 Tue Jan 23 17:26:59 2007 @@ -0,0 +1,64 @@ +To: [email protected] +Subject: patch 7.0.184 +Fcc: outbox +From: Bram Moolenaar <[EMAIL PROTECTED]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.184 +Problem: When the cscope program is called "mlcscope" the Cscope interface + doesn't work. +Solution: Accept "\S*cscope:" instead of "cscope:". (Frodak D. Baksik) +Files: src/if_cscope.c + + +*** ../vim-7.0.183/src/if_cscope.c Tue Nov 21 11:43:49 2006 +--- src/if_cscope.c Fri Jan 12 20:02:37 2007 +*************** +*** 627,636 **** + * If the database is out of date, or there's some other problem, + * cscope will output error messages before the number-of-lines output. + * Display/discard any output that doesn't match what we want. + */ + if ((stok = strtok(buf, (const char *)" ")) == NULL) + continue; +! if (strcmp((const char *)stok, "cscope:")) + continue; + + if ((stok = strtok(NULL, (const char *)" ")) == NULL) +--- 627,637 ---- + * If the database is out of date, or there's some other problem, + * cscope will output error messages before the number-of-lines output. + * Display/discard any output that doesn't match what we want. ++ * Accept "\S*cscope: X lines", also matches "mlcscope". + */ + if ((stok = strtok(buf, (const char *)" ")) == NULL) + continue; +! if (strstr((const char *)stok, "cscope:") == NULL) + continue; + + if ((stok = strtok(NULL, (const char *)" ")) == NULL) +*** ../vim-7.0.183/src/version.c Sun Jan 14 15:27:05 2007 +--- src/version.c Tue Jan 16 15:16:41 2007 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 184, + /**/ + +-- +The technology involved in making anything invisible is so infinitely +complex that nine hundred and ninety-nine billion, nine hundred and +ninety-nine million, nine hundred and ninety-nine thousand, nine hundred +and ninety-nine times out of a trillion it is much simpler and more +effective just to take the thing away and do without it. + -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" + + /// 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: SOURCES/7.0.185 diff -u /dev/null SOURCES/7.0.185:1.1 --- /dev/null Tue Jan 23 17:27:04 2007 +++ SOURCES/7.0.185 Tue Jan 23 17:26:59 2007 @@ -0,0 +1,105 @@ +To: [email protected] +Subject: patch 7.0.185 +Fcc: outbox +From: Bram Moolenaar <[EMAIL PROTECTED]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.185 +Problem: Multi-byte characters in a message are displayed with attributes + from what comes before it. +Solution: Don't use the attributes for a multi-byte character. Do use + attributes for special characters. (Yukihiro Nakadaira) +Files: src/message.c + + +*** ../vim-7.0.184/src/message.c Sat Oct 14 14:33:21 2006 +--- src/message.c Sat Jan 13 17:27:31 2007 +*************** +*** 1556,1562 **** + int c_extra = 0; + char_u *p_extra = NULL; /* init to make SASC shut up */ + int n; <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
