pull request: vim, wget
cover pull request: vim, wget
Re-import of vim/gvim/vim-tiny and wget.
* Clean vim recipe and update to 7.2.446 (446=patchset)
* Clean wget (ssl check using staging_dir)
Pull URL: git://gitorious.org/oe-zoid/meta-openembedded.git
Branch: master
Browse: http://gitorious.org/oe-zoid/meta-openembedded/commits/master
Thanks,
Michael Lippautz <[email protected]>
---
Michael Lippautz (2):
wget: Add version 1.11.4
vim: Add vim/tiny-vim/gvim 7.2 (patchset 446)
meta-oe/recipes-connectivity/wget/wget.inc | 30 + meta-oe/recipes-connectivity/wget/wget_1.11.4.bb | 7 + meta-oe/recipes-support/vim/files/401-446.diff | 5426 ++++++++++++++++++++ .../vim/files/configure.in_remove_CC_quotes.patch | 17 + meta-oe/recipes-support/vim/files/vimrc | 96 + meta-oe/recipes-support/vim/gvim_7.2.446.bb | 10 + meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb | 5 + meta-oe/recipes-support/vim/vim.inc | 77 + meta-oe/recipes-support/vim/vim_7.2.446.bb | 41 + 9 files changed, 5709 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-connectivity/wget/wget.inc create mode 100644 meta-oe/recipes-connectivity/wget/wget_1.11.4.bb create mode 100644 meta-oe/recipes-support/vim/files/401-446.diff create mode 100644 meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch create mode 100644 meta-oe/recipes-support/vim/files/vimrc create mode 100644 meta-oe/recipes-support/vim/gvim_7.2.446.bb create mode 100644 meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb create mode 100644 meta-oe/recipes-support/vim/vim.inc create mode 100644 meta-oe/recipes-support/vim/vim_7.2.446.bb
Signature · 1 line
1.7.3.4
PATCH 1/2 wget: Add version 1.11.4
* Changes from org.oe.dev: ssl autodetection uses staging dirs
Signed-off-by Michael Lippautz <[email protected]>
--- meta-oe/recipes-connectivity/wget/wget.inc | 30 ++++++++++++++++++++++ meta-oe/recipes-connectivity/wget/wget_1.11.4.bb | 7 +++++ 2 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-connectivity/wget/wget.inc create mode 100644 meta-oe/recipes-connectivity/wget/wget_1.11.4.bb
meta-oe/recipes-connectivity/wget/wget.inc new file +30 -0
@@ -0,0 +1,30 @@ +DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." +SECTION = "console/network" +LICENSE = "GPL" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +INC_PR = "r10" + +S = "${WORKDIR}/wget-${PV}" + +inherit autotools gettext + +EXTRA_OECONF = " \ + --enable-ipv6 + --with-libssl-prefix=${STAGING_DIR}${HOST_SYS}" + +# The unslung kernel does not support ipv6 +EXTRA_OECONF_unslung = "--without-ssl" +# SlugOS kernels do not support ipv6. Can be loaded as a module. +EXTRA_OECONF_slugos = "--without-ssl" + +do_install_append () { + mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${bindir}/wget wget wget.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove wget wget.${PN} +}
meta-oe/recipes-connectivity/wget/wget_1.11.4.bb new file +7 -0
@@ -0,0 +1,7 @@ +PR="${INC_PR}.0" + +SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz" +SRC_URI[md5sum] = "69e8a7296c0e12c53bd9ffd786462e87" +SRC_URI[sha256sum] = "7315963b6eefb7530b4a4f63a5d5ccdab30078784cf41ccb5297873f9adea2f3" + +require wget.inc
Signature · 1 line
1.7.3.4
PATCH 2/2 vim: Add vim/tiny-vim/gvim 7.2 (patchset 446)
In reply to Michael LippautzChanges from org.oe.dev:
* Include latest (stable) patchset
* Change from RCONFLICTS to RREPLACES where possible (gvim->vim->tiny-vim)
Signed-off-by Michael Lippautz <[email protected]>
--- meta-oe/recipes-support/vim/files/401-446.diff | 5426 ++++++++++++++++++++ .../vim/files/configure.in_remove_CC_quotes.patch | 17 + meta-oe/recipes-support/vim/files/vimrc | 96 + meta-oe/recipes-support/vim/gvim_7.2.446.bb | 10 + meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb | 5 + meta-oe/recipes-support/vim/vim.inc | 77 + meta-oe/recipes-support/vim/vim_7.2.446.bb | 41 + 7 files changed, 5672 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-support/vim/files/401-446.diff create mode 100644 meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch create mode 100644 meta-oe/recipes-support/vim/files/vimrc create mode 100644 meta-oe/recipes-support/vim/gvim_7.2.446.bb create mode 100644 meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb create mode 100644 meta-oe/recipes-support/vim/vim.inc create mode 100644 meta-oe/recipes-support/vim/vim_7.2.446.bb
meta-oe/recipes-support/vim/files/401-446.diff new file +5426 -0
@@ -0,0 +1,5426 @@ +To: [email protected] +Subject: Patch 7.2.401 +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.401 +Problem: ":e dir<Tab>" with 'wildmode' set to "list" doesn't highlight + directory names with a space. (Alexandre Provencio) +Solution: Remove the backslash before checking if the name is a directory. + (Dominique Pelle) +Files: src/ex_getln.c + + +*** ../vim-7.2.400/src/ex_getln.c 2010-03-02 17:23:10.000000000 +0100 +--- src/ex_getln.c 2010-03-17 19:00:54.000000000 +0100 +*************** +*** 3948,3955 **** + || xp->xp_context == EXPAND_SHELLCMD + || xp->xp_context == EXPAND_BUFFERS) + { +! /* highlight directories */ +! j = (mch_isdir(files_found[k])); + if (showtail) + p = L_SHOWFILE(k); + else +--- 3948,3959 ---- + || xp->xp_context == EXPAND_SHELLCMD + || xp->xp_context == EXPAND_BUFFERS) + { +! char_u *halved_slash; +! +! /* highlight directories */ +! halved_slash = backslash_halve_save(files_found[k]); +! j = mch_isdir(halved_slash); +! vim_free(halved_slash); + if (showtail) + p = L_SHOWFILE(k); + else +*** ../vim-7.2.400/src/version.c 2010-03-17 18:15:17.000000000 +0100 +--- src/version.c 2010-03-17 19:12:22.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 401, + /**/ + +-- +Two cows are standing together in a field. One asks the other: +"So what do you think about this Mad Cow Disease?" +The other replies: "That doesn't concern me. I'm a helicopter." + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.402 +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.402 +Problem: This gives a #705 error: let X = function('haslocaldir') + let X = function('getcwd') +Solution: Don't give E705 when the name is found in the hashtab. (Sergey + Khorev) +Files: src/eval.c + + +*** ../vim-7.2.401/src/eval.c 2010-03-10 13:43:22.000000000 +0100 +--- src/eval.c 2010-03-17 19:35:01.000000000 +0100 +*************** +*** 19103,19108 **** +--- 19103,19116 ---- + hashtab_T *ht; + char_u *p; + ++ ht = find_var_ht(name, &varname); ++ if (ht == NULL || *varname == NUL) ++ { ++ EMSG2(_(e_illvar), name); ++ return; ++ } ++ v = find_var_in_ht(ht, varname, TRUE); ++ + if (tv->v_type == VAR_FUNC) + { + if (!(vim_strchr((char_u *)"wbs", name[0]) != NULL && name[1] == ':') +*************** +*** 19112,19118 **** + EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name); + return; + } +! if (function_exists(name)) + { + EMSG2(_("E705: Variable name conflicts with existing function: %s"), + name); +--- 19120,19129 ---- + EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name); + return; + } +! /* Don't allow hiding a function. When "v" is not NULL we migth be +! * assigning another function to the same var, the type is checked +! * below. */ +! if (v == NULL && function_exists(name)) + { + EMSG2(_("E705: Variable name conflicts with existing function: %s"), + name); +*************** +*** 19120,19133 **** + } + } + +- ht = find_var_ht(name, &varname); +- if (ht == NULL || *varname == NUL) +- { +- EMSG2(_(e_illvar), name); +- return; +- } +- +- v = find_var_in_ht(ht, varname, TRUE); + if (v != NULL) + { + /* existing variable, need to clear the value */ +--- 19131,19136 ---- +*** ../vim-7.2.401/src/version.c 2010-03-17 19:13:19.000000000 +0100 +--- src/version.c 2010-03-17 19:36:09.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 402, + /**/ + +-- +Michael: There is no such thing as a dump question. +Bernard: Sure there is. For example "what is a core dump?" + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.403 +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.403 (after 7.2.400) +Problem: Compiler warning for pointer type. (Tony Mechelynck) +Solution: Move type cast to the right place. +Files: src/if_ruby.c + + +*** ../vim-7.2.402/src/if_ruby.c 2010-03-17 18:15:17.000000000 +0100 +--- src/if_ruby.c 2010-03-19 23:08:06.000000000 +0100 +*************** +*** 722,729 **** + + if (tv->v_type == VAR_STRING) + { +! result = rb_str_new2((char *)(tv->vval.v_string == NULL +! ? "" : tv->vval.v_string)); + } + else if (tv->v_type == VAR_NUMBER) + { +--- 722,729 ---- + + if (tv->v_type == VAR_STRING) + { +! result = rb_str_new2(tv->vval.v_string == NULL +! ? "" : (char *)(tv->vval.v_string)); + } + else if (tv->v_type == VAR_NUMBER) + { +*** ../vim-7.2.402/src/version.c 2010-03-17 19:53:44.000000000 +0100 +--- src/version.c 2010-03-19 23:07:13.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 403, + /**/ + +-- +If "R" is Reverse, how come "D" is FORWARD? + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.404 +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.404 +Problem: Pointers for composing characters are not properly initialized. +Solution: Compute the size of the pointer, not what it points to. (Yukihiro + Nakadaira) +Files: src/screen.c + + +*** ../vim-7.2.403/src/screen.c 2010-02-03 15:47:59.000000000 +0100 +--- src/screen.c 2010-03-23 13:48:05.000000000 +0100 +*************** +*** 7536,7542 **** + new_ScreenLines = (schar_T *)lalloc((long_u)( + (Rows + 1) * Columns * sizeof(schar_T)), FALSE); + #ifdef FEAT_MBYTE +! vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T) * MAX_MCO); + if (enc_utf8) + { + new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( +--- 7536,7542 ---- + new_ScreenLines = (schar_T *)lalloc((long_u)( + (Rows + 1) * Columns * sizeof(schar_T)), FALSE); + #ifdef FEAT_MBYTE +! vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); + if (enc_utf8) + { + new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( +*** ../vim-7.2.403/src/version.c 2010-03-19 23:08:22.000000000 +0100 +--- src/version.c 2010-03-23 13:54:47.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 404, + /**/ + +-- +LAUNCELOT: Isn't there a St. Aaaaarrrrrrggghhh's in Cornwall? +ARTHUR: No, that's Saint Ives. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.405 +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.405 +Problem: When built with small features the matching text is not + highlighted for ":s/pat/repl/c". +Solution: Remove the #ifdef for IncSearch. (James Vega) +Files: src/syntax.c + + +*** ../vim-7.2.404/src/syntax.c 2010-03-10 13:43:22.000000000 +0100 +--- src/syntax.c 2010-03-23 14:36:10.000000000 +0100 +*************** +*** 6205,6214 **** + { + CENT("ErrorMsg term=standout ctermbg=DarkRed ctermfg=White", + "ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White"), +- #ifdef FEAT_SEARCH_EXTRA + CENT("IncSearch term=reverse cterm=reverse", + "IncSearch term=reverse cterm=reverse gui=reverse"), +- #endif + CENT("ModeMsg term=bold cterm=bold", + "ModeMsg term=bold cterm=bold gui=bold"), + CENT("NonText term=bold ctermfg=Blue", +--- 6205,6212 ---- +*** ../vim-7.2.404/src/version.c 2010-03-23 13:56:53.000000000 +0100 +--- src/version.c 2010-03-23 14:37:08.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 405, + /**/ + +-- +Dreams are free, but there's a small charge for alterations. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.406 +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.406 +Problem: Patch 7.2.119 introduces uninit mem read. (Dominique Pelle) +Solution: Only used ScreeenLinesC when ScreeenLinesUC is not zero. (Yukihiro + Nakadaira) Also clear ScreeenLinesC when allocating. +Files: src/screen.c + + +*** ../vim-7.2.405/src/screen.c 2010-03-23 13:56:53.000000000 +0100 +--- src/screen.c 2010-03-23 15:26:44.000000000 +0100 +*************** +*** 25,34 **** + * one character which occupies two display cells. + * For UTF-8 a multi-byte character is converted to Unicode and stored in + * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII +! * character without composing chars ScreenLinesUC[] will be 0. When the +! * character occupies two display cells the next byte in ScreenLines[] is 0. + * ScreenLinesC[][] contain up to 'maxcombine' composing characters +! * (drawn on top of the first character). They are 0 when not used. + * ScreenLines2[] is only used for euc-jp to store the second byte if the + * first byte is 0x8e (single-width character). + * +--- 25,35 ---- + * one character which occupies two display cells. + * For UTF-8 a multi-byte character is converted to Unicode and stored in + * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII +! * character without composing chars ScreenLinesUC[] will be 0 and +! * ScreenLinesC[][] is not used. When the character occupies two display +! * cells the next byte in ScreenLines[] is 0. + * ScreenLinesC[][] contain up to 'maxcombine' composing characters +! * (drawn on top of the first character). There is 0 after the last one used. + * ScreenLines2[] is only used for euc-jp to store the second byte if the + * first byte is 0x8e (single-width character). + * +*************** +*** 4893,4898 **** +--- 4894,4900 ---- + + /* + * Return if the composing characters at "off_from" and "off_to" differ. ++ * Only to be used when ScreenLinesUC[off_from] != 0. + */ + static int + comp_char_differs(off_from, off_to) +*************** +*** 6281,6286 **** +--- 6283,6289 ---- + /* + * Return TRUE if composing characters for screen posn "off" differs from + * composing characters in "u8cc". ++ * Only to be used when ScreenLinesUC[off] != 0. + */ + static int + screen_comp_differs(off, u8cc) +*************** +*** 6461,6468 **** + && c == 0x8e + && ScreenLines2[off] != ptr[1]) + || (enc_utf8 +! && (ScreenLinesUC[off] != (u8char_T)(c >= 0x80 ? u8c : 0) +! || screen_comp_differs(off, u8cc))) + #endif + || ScreenAttrs[off] != attr + || exmode_active; +--- 6464,6473 ---- + && c == 0x8e + && ScreenLines2[off] != ptr[1]) + || (enc_utf8 +! && (ScreenLinesUC[off] != +! (u8char_T)(c < 0x80 && u8cc[0] == 0 ? 0 : u8c) +! || (ScreenLinesUC[off] != 0 +! && screen_comp_differs(off, u8cc)))) + #endif + || ScreenAttrs[off] != attr + || exmode_active; +*************** +*** 7542,7548 **** + new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( + (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); + for (i = 0; i < p_mco; ++i) +! new_ScreenLinesC[i] = (u8char_T *)lalloc((long_u)( + (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); + } + if (enc_dbcs == DBCS_JPNU) +--- 7547,7553 ---- + new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( + (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); + for (i = 0; i < p_mco; ++i) +! new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( + (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); + } + if (enc_dbcs == DBCS_JPNU) +*** ../vim-7.2.405/src/version.c 2010-03-23 14:39:07.000000000 +0100 +--- src/version.c 2010-03-23 15:34:11.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 406, + /**/ + +-- +VOICE OVER: As the horrendous Black Beast lunged forward, escape for Arthur + and his knights seemed hopeless, when, suddenly ... the animator + suffered a fatal heart attack. +ANIMATOR: Aaaaagh! +VOICE OVER: The cartoon peril was no more ... The Quest for Holy Grail could + continue. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.407 +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.407 +Problem: When using an expression in ":s" backslashes in the result are + dropped. (Sergey Goldgaber, Christian Brabandt) +Solution: Double backslashes. +Files: src/regexp.c + + +*** ../vim-7.2.406/src/regexp.c 2009-11-26 20:41:19.000000000 +0100 +--- src/regexp.c 2010-03-23 16:22:35.000000000 +0100 +*************** +*** 6963,6968 **** +--- 6963,6970 ---- + eval_result = eval_to_string(source + 2, NULL, TRUE); + if (eval_result != NULL) + { ++ int had_backslash = FALSE; ++ + for (s = eval_result; *s != NUL; mb_ptr_adv(s)) + { + /* Change NL to CR, so that it becomes a line break. +*************** +*** 6970,6976 **** +--- 6972,6991 ---- + if (*s == NL) + *s = CAR; + else if (*s == '\\' && s[1] != NUL) ++ { + ++s; ++ had_backslash = TRUE; ++ } ++ } ++ if (had_backslash && backslash) ++ { ++ /* Backslashes will be consumed, need to double them. */ ++ s = vim_strsave_escaped(eval_result, (char_u *)"\\"); ++ if (s != NULL) ++ { ++ vim_free(eval_result); ++ eval_result = s; ++ } + } + + dst += STRLEN(eval_result); +*** ../vim-7.2.406/src/version.c 2010-03-23 15:36:29.000000000 +0100 +--- src/version.c 2010-03-23 16:26:22.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 407, + /**/ + +-- +Sorry, no fortune today. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.408 +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.408 +Problem: With ":g/the/s/foo/bar/" the '[ and '] marks can be set to a line + that was not changed. +Solution: Only set '[ and '] marks when a substitution was done. +Files: src/ex_cmds.c + + +*** ../vim-7.2.407/src/ex_cmds.c 2009-07-09 20:06:30.000000000 +0200 +--- src/ex_cmds.c 2010-03-23 17:31:17.000000000 +0100 +*************** +*** 4238,4243 **** +--- 4238,4244 ---- + char_u *sub_firstline; /* allocated copy of first sub line */ + int endcolumn = FALSE; /* cursor in last column when done */ + pos_T old_cursor = curwin->w_cursor; ++ int start_nsubs; + + cmd = eap->arg; + if (!global_busy) +*************** +*** 4245,4250 **** +--- 4246,4252 ---- + sub_nsubs = 0; + sub_nlines = 0; + } ++ start_nsubs = sub_nsubs; + + if (eap->cmdidx == CMD_tilde) + which_pat = RE_LAST; /* use last used regexp */ +*************** +*** 5106,5112 **** + if (do_count) + curwin->w_cursor = old_cursor; + +! if (sub_nsubs) + { + /* Set the '[ and '] marks. */ + curbuf->b_op_start.lnum = eap->line1; +--- 5108,5114 ---- + if (do_count) + curwin->w_cursor = old_cursor; + +! if (sub_nsubs > start_nsubs) + { + /* Set the '[ and '] marks. */ + curbuf->b_op_start.lnum = eap->line1; +*** ../vim-7.2.407/src/version.c 2010-03-23 16:27:15.000000000 +0100 +--- src/version.c 2010-03-23 17:35:40.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 408, + /**/ + +-- +Permission is granted to read this message out aloud on Kings Cross Road, +London, under the condition that the orator is properly dressed. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.409 +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.409 +Problem: Summary of number of substitutes is incorrect for ":folddo". (Jean + Johner) +Solution: Reset sub_nsubs and sub_nlines in global_exe(). +Files: src/ex_cmds.c + + +*** ../vim-7.2.408/src/ex_cmds.c 2010-03-23 17:36:24.000000000 +0100 +--- src/ex_cmds.c 2010-03-23 17:42:49.000000000 +0100 +*************** +*** 5238,5245 **** + type = *eap->cmd; + cmd = eap->arg; + which_pat = RE_LAST; /* default: use last used regexp */ +- sub_nsubs = 0; +- sub_nlines = 0; + + /* + * undocumented vi feature: +--- 5238,5243 ---- +*************** +*** 5343,5348 **** +--- 5341,5348 ---- + /* When the command writes a message, don't overwrite the command. */ + msg_didout = TRUE; + ++ sub_nsubs = 0; ++ sub_nlines = 0; + global_need_beginline = FALSE; + global_busy = 1; + old_lcount = curbuf->b_ml.ml_line_count; +*** ../vim-7.2.408/src/version.c 2010-03-23 17:36:24.000000000 +0100 +--- src/version.c 2010-03-23 17:47:53.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 409, + /**/ + +-- +BRIDGEKEEPER: What is your favorite colour? +LAUNCELOT: Blue. +BRIDGEKEEPER: Right. Off you go. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.410 +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.410 +Problem: Highlighting directories for completion doesn't work properly. +Solution: Don't halve backslashes when not needed, expaned "~/". + (Dominique Pelle) +Files: src/ex_getln.c + + +*** ../vim-7.2.409/src/ex_getln.c 2010-03-17 19:13:19.000000000 +0100 +--- src/ex_getln.c 2010-03-23 18:00:56.000000000 +0100 +*************** +*** 3948,3959 **** + || xp->xp_context == EXPAND_SHELLCMD + || xp->xp_context == EXPAND_BUFFERS) + { +- char_u *halved_slash; +- + /* highlight directories */ +! halved_slash = backslash_halve_save(files_found[k]); +! j = mch_isdir(halved_slash); +! vim_free(halved_slash); + if (showtail) + p = L_SHOWFILE(k); + else +--- 3948,3973 ---- + || xp->xp_context == EXPAND_SHELLCMD + || xp->xp_context == EXPAND_BUFFERS) + { + /* highlight directories */ +! if (xp->xp_numfiles != -1) +! { +! char_u *halved_slash; +! char_u *exp_path; +! +! /* Expansion was done before and special characters +! * were escaped, need to halve backslashes. Also +! * $HOME has been replaced with ~/. */ +! exp_path = expand_env_save_opt(files_found[k], TRUE); +! halved_slash = backslash_halve_save( +! exp_path != NULL ? exp_path : files_found[k]); +! j = mch_isdir(halved_slash != NULL ? halved_slash +! : files_found[k]); +! vim_free(exp_path); +! vim_free(halved_slash); +! } +! else +! /* Expansion was done here, file names are literal. */ +! j = mch_isdir(files_found[k]); + if (showtail) + p = L_SHOWFILE(k); + else +*** ../vim-7.2.409/src/version.c 2010-03-23 17:49:19.000000000 +0100 +--- src/version.c 2010-03-23 18:04:25.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 410, + /**/ + +-- +BRIDGEKEEPER: What is your favorite colour? +GAWAIN: Blue ... No yelloooooww! + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.411 +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.411 +Problem: When parsing 'cino' a comma isn't skipped properly. +Solution: Skip the comma. (Lech Lorens) +Files: src/misc1.c + + +*** ../vim-7.2.410/src/misc1.c 2010-03-02 12:37:01.000000000 +0100 +--- src/misc1.c 2010-03-23 18:18:15.000000000 +0100 +*************** +*** 6270,6275 **** +--- 6270,6277 ---- + case 'l': ind_keep_case_label = n; break; + case '#': ind_hash_comment = n; break; + } ++ if (*options == ',') ++ ++options; + } + + /* remember where the cursor was when we started */ +*** ../vim-7.2.410/src/version.c 2010-03-23 18:06:47.000000000 +0100 +--- src/version.c 2010-03-23 18:22:13.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 411, + /**/ + +-- +BRIDGEKEEPER: What is your favorite editor? +GAWAIN: Emacs ... No, Viiiiiiiiiiimmmmmmm! + "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.412 +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.412 +Problem: [ or ] followed by mouse click doesn't work. +Solution: Reverse check for key being a mouse event. (Dominique Pelle) +Files: src/normal.c + + +*** ../vim-7.2.411/src/normal.c 2010-03-17 13:07:01.000000000 +0100 +--- src/normal.c 2010-05-07 15:46:54.000000000 +0200 +*************** +*** 3196,3202 **** + * There are a few special cases where we want certain combinations of + * characters to be considered as a single word. These are things like + * "->", "/ *", "*=", "+=", "&=", "<=", ">=", "!=" etc. Otherwise, each +! * character is in it's own class. + */ + if (c != NUL && vim_strchr((char_u *)"-+*/%<>&|^!=", c) != NULL) + return 1; +--- 3196,3202 ---- + * There are a few special cases where we want certain combinations of + * characters to be considered as a single word. These are things like + * "->", "/ *", "*=", "+=", "&=", "<=", ">=", "!=" etc. Otherwise, each +! * character is in its own class. + */ + if (c != NUL && vim_strchr((char_u *)"-+*/%<>&|^!=", c) != NULL) + return 1; +*************** +*** 4085,4091 **** + /* + * Command character that's ignored. + * Used for CTRL-Q and CTRL-S to avoid problems with terminals that use +! * xon/xoff + */ + static void + nv_ignore(cap) +--- 4085,4091 ---- + /* + * Command character that's ignored. + * Used for CTRL-Q and CTRL-S to avoid problems with terminals that use +! * xon/xoff. + */ + static void + nv_ignore(cap) +*************** +*** 6523,6529 **** + * [ or ] followed by a middle mouse click: put selected text with + * indent adjustment. Any other button just does as usual. + */ +! else if (cap->nchar >= K_LEFTMOUSE && cap->nchar <= K_RIGHTRELEASE) + { + (void)do_mouse(cap->oap, cap->nchar, + (cap->cmdchar == ']') ? FORWARD : BACKWARD, +--- 6523,6529 ---- + * [ or ] followed by a middle mouse click: put selected text with + * indent adjustment. Any other button just does as usual. + */ +! else if (cap->nchar >= K_RIGHTRELEASE && cap->nchar <= K_LEFTMOUSE) + { + (void)do_mouse(cap->oap, cap->nchar, + (cap->cmdchar == ']') ? FORWARD : BACKWARD, +*** ../vim-7.2.411/src/version.c 2010-03-23 18:22:40.000000000 +0100 +--- src/version.c 2010-05-07 15:51:35.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 412, + /**/ + +-- +I have a drinking problem -- I don't have a drink! + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.413 +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.413 +Problem: Large file support is incorrect. +Solution: Add AC_SYS_LARGEFILE to configure. (James Vega) +Files: src/configure.in, src/config.h.in, src/auto/configure + + +*** ../vim-7.2.412/src/configure.in 2010-03-10 16:27:27.000000000 +0100 +--- src/configure.in 2010-04-01 15:06:04.000000000 +0200 +*************** +*** 2669,2674 **** +--- 2669,2678 ---- + usleep utime utimes) + AC_FUNC_FSEEKO + ++ dnl define _LARGE_FILES, _FILE_OFFSET_BITS and _LARGEFILE_SOURCE when ++ dnl appropriate, so that off_t is 64 bits when needed. ++ AC_SYS_LARGEFILE ++ + dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible + AC_MSG_CHECKING(for st_blksize) + AC_TRY_COMPILE( +*** ../vim-7.2.412/src/config.h.in 2010-02-24 14:46:58.000000000 +0100 +--- src/config.h.in 2010-04-01 15:10:49.000000000 +0200 +*************** +*** 196,201 **** +--- 196,206 ---- + #undef HAVE_UTIME + #undef HAVE_BIND_TEXTDOMAIN_CODESET + ++ /* Define, if needed, for accessing large files. */ ++ #undef _LARGE_FILES ++ #undef _FILE_OFFSET_BITS ++ #undef _LARGEFILE_SOURCE ++ + /* Define if you do not have utime(), but do have the utimes() function. */ + #undef HAVE_UTIMES + +*** ../vim-7.2.412/src/auto/configure 2010-03-10 16:27:27.000000000 +0100 +--- src/auto/configure 2010-05-07 16:01:08.000000000 +0200 +*************** +*** 821,826 **** +--- 821,827 ---- + with_gnome + with_motif_lib + with_tlib ++ enable_largefile + enable_acl + enable_gpm + enable_sysmouse +*************** +*** 1485,1490 **** +--- 1486,1492 ---- + --enable-nextaw-check If auto-select GUI, check for neXtaw default=yes + --enable-carbon-check If auto-select GUI, check for Carbon default=yes + --disable-gtktest Do not try to compile and run a test GTK program ++ --disable-largefile omit support for large files + --disable-acl Don't check for ACL support. + --disable-gpm Don't use gpm (Linux mouse daemon). + --disable-sysmouse Don't use sysmouse (mouse in *BSD console). +*************** +*** 14345,14350 **** +--- 14347,14709 ---- + fi + + ++ # Check whether --enable-largefile was given. ++ if test "${enable_largefile+set}" = set; then ++ enableval=$enable_largefile; ++ fi ++ ++ if test "$enable_largefile" != no; then ++ ++ { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 ++ $as_echo_n "checking for special C compiler options needed for large files... " >&6; } ++ if test "${ac_cv_sys_largefile_CC+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++ else ++ ac_cv_sys_largefile_CC=no ++ if test "$GCC" != yes; then ++ ac_save_CC=$CC ++ while :; do ++ # IRIX 6.2 and later do not support large files by default, ++ # so use the C compiler's -n32 option if that helps. ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++ _ACEOF ++ cat confdefs.h >>conftest.$ac_ext ++ cat >>conftest.$ac_ext <<_ACEOF ++ /* end confdefs.h. */ ++ #include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++ int ++ main () ++ { ++ ++ ; ++ return 0; ++ } ++ _ACEOF ++ rm -f conftest.$ac_objext ++ if { (ac_try="$ac_compile" ++ case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++ esac ++ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++ $as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ break ++ else ++ $as_echo "$as_me: failed program was:" >&5 ++ sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++ fi ++ ++ rm -f core conftest.err conftest.$ac_objext ++ CC="$CC -n32" ++ rm -f conftest.$ac_objext ++ if { (ac_try="$ac_compile" ++ case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++ esac ++ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++ $as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_sys_largefile_CC=' -n32'; break ++ else ++ $as_echo "$as_me: failed program was:" >&5 ++ sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++ fi ++ ++ rm -f core conftest.err conftest.$ac_objext ++ break ++ done ++ CC=$ac_save_CC ++ rm -f conftest.$ac_ext ++ fi ++ fi ++ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 ++ $as_echo "$ac_cv_sys_largefile_CC" >&6; } ++ if test "$ac_cv_sys_largefile_CC" != no; then ++ CC=$CC$ac_cv_sys_largefile_CC ++ fi ++ ++ { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } ++ if test "${ac_cv_sys_file_offset_bits+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++ else ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++ _ACEOF ++ cat confdefs.h >>conftest.$ac_ext ++ cat >>conftest.$ac_ext <<_ACEOF ++ /* end confdefs.h. */ ++ #include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++ int ++ main () ++ { ++ ++ ; ++ return 0; ++ } ++ _ACEOF ++ rm -f conftest.$ac_objext ++ if { (ac_try="$ac_compile" ++ case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++ esac ++ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++ $as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_sys_file_offset_bits=no; break ++ else ++ $as_echo "$as_me: failed program was:" >&5 ++ sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++ fi ++ ++ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++ _ACEOF ++ cat confdefs.h >>conftest.$ac_ext ++ cat >>conftest.$ac_ext <<_ACEOF ++ /* end confdefs.h. */ ++ #define _FILE_OFFSET_BITS 64 ++ #include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++ int ++ main () ++ { ++ ++ ; ++ return 0; ++ } ++ _ACEOF ++ rm -f conftest.$ac_objext ++ if { (ac_try="$ac_compile" ++ case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++ esac ++ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++ $as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_sys_file_offset_bits=64; break ++ else ++ $as_echo "$as_me: failed program was:" >&5 ++ sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++ fi ++ ++ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cv_sys_file_offset_bits=unknown ++ break ++ done ++ fi ++ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 ++ $as_echo "$ac_cv_sys_file_offset_bits" >&6; } ++ case $ac_cv_sys_file_offset_bits in #( ++ no | unknown) ;; ++ *) ++ cat >>confdefs.h <<_ACEOF ++ #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits ++ _ACEOF ++ ;; ++ esac ++ rm -rf conftest* ++ if test $ac_cv_sys_file_offset_bits = unknown; then ++ { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 ++ $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } ++ if test "${ac_cv_sys_large_files+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++ else ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++ _ACEOF ++ cat confdefs.h >>conftest.$ac_ext ++ cat >>conftest.$ac_ext <<_ACEOF ++ /* end confdefs.h. */ ++ #include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++ int ++ main () ++ { ++ ++ ; ++ return 0; ++ } ++ _ACEOF ++ rm -f conftest.$ac_objext ++ if { (ac_try="$ac_compile" ++ case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++ esac ++ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++ $as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_sys_large_files=no; break ++ else ++ $as_echo "$as_me: failed program was:" >&5 ++ sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++ fi ++ ++ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++ _ACEOF ++ cat confdefs.h >>conftest.$ac_ext ++ cat >>conftest.$ac_ext <<_ACEOF ++ /* end confdefs.h. */ ++ #define _LARGE_FILES 1 ++ #include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++ int ++ main () ++ { ++ ++ ; ++ return 0; ++ } ++ _ACEOF ++ rm -f conftest.$ac_objext ++ if { (ac_try="$ac_compile" ++ case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++ esac ++ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++ $as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_sys_large_files=1; break ++ else ++ $as_echo "$as_me: failed program was:" >&5 ++ sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++ fi ++ ++ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cv_sys_large_files=unknown ++ break ++ done ++ fi ++ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 ++ $as_echo "$ac_cv_sys_large_files" >&6; } ++ case $ac_cv_sys_large_files in #( ++ no | unknown) ;; ++ *) ++ cat >>confdefs.h <<_ACEOF ++ #define _LARGE_FILES $ac_cv_sys_large_files ++ _ACEOF ++ ;; ++ esac ++ rm -rf conftest* ++ fi ++ fi ++ ++ + { $as_echo "$as_me:$LINENO: checking for st_blksize" >&5 + $as_echo_n "checking for st_blksize... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +*** ../vim-7.2.412/src/version.c 2010-05-07 15:51:59.000000000 +0200 +--- src/version.c 2010-05-07 16:04:29.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 413, + /**/ + +-- +How To Keep A Healthy Level Of Insanity: +2. Page yourself over the intercom. Don't disguise your voice. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.414 +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.414 +Problem: CTRK-K <space> <space> does not produce 0xa0 as expected. (Tony + Mechelynck) +Solution: Remove the Unicode range 0xe000 - 0xefff from digraphs, these are + not valid characters. +Files: src/digraph.c + + +*** ../vim-7.2.413/src/digraph.c 2009-05-13 14:12:14.000000000 +0200 +--- src/digraph.c 2010-04-11 17:28:22.000000000 +0200 +*************** +*** 1933,1977 **** + {'7', 'c', 0x3226}, + {'8', 'c', 0x3227}, + {'9', 'c', 0x3228}, +! {' ', ' ', 0xe000}, +! {'/', 'c', 0xe001}, +! {'U', 'A', 0xe002}, +! {'U', 'B', 0xe003}, +! {'"', '3', 0xe004}, +! {'"', '1', 0xe005}, +! {'"', '!', 0xe006}, +! {'"', '\'', 0xe007}, +! {'"', '>', 0xe008}, +! {'"', '?', 0xe009}, +! {'"', '-', 0xe00a}, +! {'"', '(', 0xe00b}, +! {'"', '.', 0xe00c}, +! {'"', ':', 0xe00d}, +! {'"', '0', 0xe00e}, +! {'"', '"', 0xe00f}, +! {'"', '<', 0xe010}, +! {'"', ',', 0xe011}, +! {'"', ';', 0xe012}, +! {'"', '_', 0xe013}, +! {'"', '=', 0xe014}, +! {'"', '/', 0xe015}, +! {'"', 'i', 0xe016}, +! {'"', 'd', 0xe017}, +! {'"', 'p', 0xe018}, +! {';', ';', 0xe019}, +! {',', ',', 0xe01a}, +! {'b', '3', 0xe01b}, +! {'C', 'i', 0xe01c}, +! {'f', '(', 0xe01d}, +! {'e', 'd', 0xe01e}, +! {'a', 'm', 0xe01f}, +! {'p', 'm', 0xe020}, +! {'F', 'l', 0xe023}, +! {'G', 'F', 0xe024}, +! {'>', 'V', 0xe025}, +! {'!', '*', 0xe026}, +! {'?', '*', 0xe027}, +! {'J', '<', 0xe028}, + {'f', 'f', 0xfb00}, + {'f', 'i', 0xfb01}, + {'f', 'l', 0xfb02}, +--- 1933,1940 ---- + {'7', 'c', 0x3226}, + {'8', 'c', 0x3227}, + {'9', 'c', 0x3228}, +! /* code points 0xe000 - 0xefff excluded, they have no assigned +! * characters, only used in proposals. */ + {'f', 'f', 0xfb00}, + {'f', 'i', 0xfb01}, + {'f', 'l', 0xfb02}, +*** ../vim-7.2.413/src/version.c 2010-05-07 16:05:48.000000000 +0200 +--- src/version.c 2010-05-07 16:17:26.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 414, + /**/ + +-- +How To Keep A Healthy Level Of Insanity: +4. Put your garbage can on your desk and label it "in". + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.415 +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.415 +Problem: Win32: Can't open a remote file when starting Vim. +Solution: Don't invoke cygwin_conv_path() for URLs. (Tomoya Adachi) +Files: src/main.c + + +*** ../vim-7.2.414/src/main.c 2009-12-16 18:27:29.000000000 +0100 +--- src/main.c 2010-04-12 20:57:44.000000000 +0200 +*************** +*** 1477,1483 **** + ++initstr; + } + +! /* Avoid using evim mode for "editor". */ + if (TOLOWER_ASC(initstr[0]) == 'e' + && (TOLOWER_ASC(initstr[1]) == 'v' + || TOLOWER_ASC(initstr[1]) == 'g')) +--- 1477,1483 ---- + ++initstr; + } + +! /* Use evim mode for "evim" and "egvim", not for "editor". */ + if (TOLOWER_ASC(initstr[0]) == 'e' + && (TOLOWER_ASC(initstr[1]) == 'v' + || TOLOWER_ASC(initstr[1]) == 'g')) +*************** +*** 2262,2268 **** + * Look for evidence of non-Cygwin paths before we bother. + * This is only for when using the Unix files. + */ +! if (strpbrk(p, "\\:") != NULL) + { + char posix_path[PATH_MAX]; + +--- 2262,2268 ---- + * Look for evidence of non-Cygwin paths before we bother. + * This is only for when using the Unix files. + */ +! if (strpbrk(p, "\\:") != NULL && !path_with_url(p)) + { + char posix_path[PATH_MAX]; + +*** ../vim-7.2.414/src/version.c 2010-05-07 16:18:08.000000000 +0200 +--- src/version.c 2010-05-07 16:34:22.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 415, + /**/ + +-- +How To Keep A Healthy Level Of Insanity: +6. In the memo field of all your checks, write "for sexual favors". + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.416 +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.416 +Problem: Logtalk.dict is not installed. +Solution: Add it to the install target. (Markus Heidelberg) +Files: src/Makefile + + +*** ../vim-7.2.415/src/Makefile 2010-05-07 16:35:12.000000000 +0200 +--- src/Makefile 2010-04-06 20:19:48.000000000 +0200 +*************** +*** 30,36 **** + # want to disable using X11 libraries. This speeds up starting Vim, + # but the window title will not be set and the X11 selection can not + # used. +! # - Uncomment the line "CONF_OPT_XSMP = --without-xsmp" if you have the + # X11 Session Management Protocol (XSMP) library (libSM) but do not + # want to use it. + # This can speedup Vim startup but Vim loses the ability to catch the +--- 30,36 ---- + # want to disable using X11 libraries. This speeds up starting Vim, + # but the window title will not be set and the X11 selection can not + # used. +! # - Uncomment the line "CONF_OPT_XSMP = --disable-xsmp" if you have the + # X11 Session Management Protocol (XSMP) library (libSM) but do not + # want to use it. + # This can speedup Vim startup but Vim loses the ability to catch the +*************** +*** 1882,1888 **** + cd $(PLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_PLUG) + cd $(DEST_PLUG); chmod $(HELPMOD) *.vim README.txt + # install the ftplugin files +! cd $(FTPLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_FTP) + cd $(DEST_FTP); chmod $(HELPMOD) *.vim README.txt + # install the compiler files + cd $(COMPSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_COMP) +--- 1882,1888 ---- + cd $(PLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_PLUG) + cd $(DEST_PLUG); chmod $(HELPMOD) *.vim README.txt + # install the ftplugin files +! cd $(FTPLUGSOURCE); $(INSTALL_DATA) *.vim README.txt logtalk.dict $(DEST_FTP) + cd $(DEST_FTP); chmod $(HELPMOD) *.vim README.txt + # install the compiler files + cd $(COMPSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_COMP) +*** ../vim-7.2.415/src/version.c 2010-05-07 16:34:59.000000000 +0200 +--- src/version.c 2010-05-07 16:53:17.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 416, + /**/ + +-- +How To Keep A Healthy Level Of Insanity: +8. Don't use any punctuation marks. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.417 +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.417 +Problem: When 'shell' has an argument with a slash then 'shellpipe' is not + set properly. (Britton Kerin) +Solution: Assume there are no spaces in the path, arguments follow. +Files: src/option.c + + +*** ../vim-7.2.416/src/option.c 2010-02-24 14:34:10.000000000 +0100 +--- src/option.c 2010-05-13 13:05:28.000000000 +0200 +*************** +*** 3696,3704 **** +--- 3696,3727 ---- + * Isolate the name of the shell: + * - Skip beyond any path. E.g., "/usr/bin/csh -f" -> "csh -f". + * - Remove any argument. E.g., "csh -f" -> "csh". ++ * But don't allow a space in the path, so that this works: ++ * "/usr/bin/csh --rcfile ~/.cshrc" ++ * But don't do that for Windows, it's common to have a space in the path. + */ ++ #ifdef WIN3264 + p = gettail(p_sh); + p = vim_strnsave(p, (int)(skiptowhite(p) - p)); ++ #else ++ p = skiptowhite(p_sh); ++ if (*p == NUL) ++ { ++ /* No white space, use the tail. */ ++ p = vim_strsave(gettail(p_sh)); ++ } ++ else ++ { ++ char_u *p1, *p2; ++ ++ /* Find the last path separator before the space. */ ++ p1 = p_sh; ++ for (p2 = p_sh; p2 < p; mb_ptr_adv(p2)) ++ if (vim_ispathsep(*p2)) ++ p1 = p2 + 1; ++ p = vim_strnsave(p1, (int)(p - p1)); ++ } ++ #endif + if (p != NULL) + { + /* +*** ../vim-7.2.416/src/version.c 2010-05-07 16:54:32.000000000 +0200 +--- src/version.c 2010-05-13 13:11:17.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 417, + /**/ + +-- +If you put 7 of the most talented OSS developers in a room for a week +and asked them to fix a bug in a spreadsheet program, in 1 week +you'd have 2 new mail readers and a text-based web browser. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.418 +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.418 +Problem: Vim tries to set the background or foreground color in a terminal + to -1. (Graywh) Happens with ":hi Normal ctermbg=NONE". +Solution: When resetting the foreground or background color don't set the + color, let the clear screen code do that. +Files: src/syntax.c + + +*** ../vim-7.2.417/src/syntax.c 2010-03-23 14:39:07.000000000 +0100 +--- src/syntax.c 2010-05-13 15:34:27.000000000 +0200 +*************** +*** 7136,7142 **** + } + } + } +! /* Add one to the argument, to avoid zero */ + if (key[5] == 'F') + { + HL_TABLE()[idx].sg_cterm_fg = color + 1; +--- 7136,7143 ---- + } + } + } +! /* Add one to the argument, to avoid zero. Zero is used for +! * "NONE", then "color" is -1. */ + if (key[5] == 'F') + { + HL_TABLE()[idx].sg_cterm_fg = color + 1; +*************** +*** 7150,7156 **** + #endif + { + must_redraw = CLEAR; +! if (termcap_active) + term_fg_color(color); + } + } +--- 7151,7157 ---- + #endif + { + must_redraw = CLEAR; +! if (termcap_active && color >= 0) + term_fg_color(color); + } + } +*************** +*** 7167,7182 **** + #endif + { + must_redraw = CLEAR; +! if (termcap_active) +! term_bg_color(color); +! if (t_colors < 16) +! i = (color == 0 || color == 4); +! else +! i = (color < 7 || color == 8); +! /* Set the 'background' option if the value is wrong. */ +! if (i != (*p_bg == 'd')) +! set_option_value((char_u *)"bg", 0L, +! i ? (char_u *)"dark" : (char_u *)"light", 0); + } + } + } +--- 7168,7188 ---- + #endif + { + must_redraw = CLEAR; +! if (color >= 0) +! { +! if (termcap_active) +! term_bg_color(color); +! if (t_colors < 16) +! i = (color == 0 || color == 4); +! else +! i = (color < 7 || color == 8); +! /* Set the 'background' option if the value is +! * wrong. */ +! if (i != (*p_bg == 'd')) +! set_option_value((char_u *)"bg", 0L, +! i ? (char_u *)"dark" +! : (char_u *)"light", 0); +! } + } + } + } +*** ../vim-7.2.417/src/version.c 2010-05-13 13:12:01.000000000 +0200 +--- src/version.c 2010-05-13 14:29:59.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 418, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +30. Even though you died last week, you've managed to retain OPS on your + favorite IRC channel. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.419 +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.419 +Problem: Memory leak in Motif when clicking on "Search Vim Help". +Solution: Free string returned by XmTextGetString(). (Dominique Pelle) +Files: src/gui_motif.c + + +*** ../vim-7.2.418/src/gui_motif.c 2009-05-21 23:25:38.000000000 +0200 +--- src/gui_motif.c 2010-05-13 16:08:14.000000000 +0200 +*************** +*** 2917,2922 **** +--- 2917,2923 ---- + *textfield = NUL; + else + vim_strncpy(textfield, p, IOSIZE - 1); ++ XtFree((char *)p); + } + + suppress_dialog_mnemonics(dialogform); +*** ../vim-7.2.418/src/version.c 2010-05-13 15:40:23.000000000 +0200 +--- src/version.c 2010-05-13 16:09:28.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 419, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +32. You don't know what sex three of your closest friends are, because they + have neutral nicknames and you never bothered to ask. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.420 +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.420 +Problem: ":argedit" does not accept "++enc=utf8" as documented. (Dominique + Pelle) +Solution: Add the ARGOPT flag to ":argedit". +Files: src/ex_cmds.h + + +*** ../vim-7.2.419/src/ex_cmds.h 2009-07-09 15:55:34.000000000 +0200 +--- src/ex_cmds.h 2010-05-13 16:18:38.000000000 +0200 +*************** +*** 52,58 **** + #define ARGOPT 0x40000L /* allow "++opt=val" argument */ + #define SBOXOK 0x80000L /* allowed in the sandbox */ + #define CMDWIN 0x100000L /* allowed in cmdline window */ +! #define MODIFY 0x200000L /* forbidden in non-'modifiable' buffer */ + #define EXFLAGS 0x400000L /* allow flags after count in argument */ + #define FILES (XFILE | EXTRA) /* multiple extra files allowed */ + #define WORD1 (EXTRA | NOSPC) /* one extra word allowed */ +--- 52,58 ---- + #define ARGOPT 0x40000L /* allow "++opt=val" argument */ + #define SBOXOK 0x80000L /* allowed in the sandbox */ + #define CMDWIN 0x100000L /* allowed in cmdline window */ +! #define MODIFY 0x200000L /* forbidden in non-'modifiable' buffer */ + #define EXFLAGS 0x400000L /* allow flags after count in argument */ + #define FILES (XFILE | EXTRA) /* multiple extra files allowed */ + #define WORD1 (EXTRA | NOSPC) /* one extra word allowed */ +*************** +*** 116,122 **** + EX(CMD_argdo, "argdo", ex_listdo, + BANG|NEEDARG|EXTRA|NOTRLCOM), + EX(CMD_argedit, "argedit", ex_argedit, +! BANG|NEEDARG|RANGE|NOTADR|FILE1|EDITCMD|TRLBAR), + EX(CMD_argglobal, "argglobal", ex_args, + BANG|FILES|EDITCMD|ARGOPT|TRLBAR), + EX(CMD_arglocal, "arglocal", ex_args, +--- 116,122 ---- + EX(CMD_argdo, "argdo", ex_listdo, + BANG|NEEDARG|EXTRA|NOTRLCOM), + EX(CMD_argedit, "argedit", ex_argedit, +! BANG|NEEDARG|RANGE|NOTADR|FILE1|EDITCMD|ARGOPT|TRLBAR), + EX(CMD_argglobal, "argglobal", ex_args, + BANG|FILES|EDITCMD|ARGOPT|TRLBAR), + EX(CMD_arglocal, "arglocal", ex_args, +*** ../vim-7.2.419/src/version.c 2010-05-13 16:31:15.000000000 +0200 +--- src/version.c 2010-05-13 16:43:30.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 420, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +33. You name your children Eudora, Mozilla and Dotcom. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.421 +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.421 +Problem: Folds are sometimes not updated properly and there is no way to + force an update. +Solution: Make "zx" and "zX" recompute folds (suggested by Christian + Brabandt) +Files: src/normal.c + + +*** ../vim-7.2.420/src/normal.c 2010-05-07 15:51:59.000000000 +0200 +--- src/normal.c 2010-05-13 16:43:05.000000000 +0200 +*************** +*** 4936,4948 **** + + /* "zx": re-apply 'foldlevel' and open folds at the cursor */ + case 'x': curwin->w_p_fen = TRUE; +! newFoldLevel(); /* update right now */ + foldOpenCursor(); + break; + + /* "zX": undo manual opens/closes, re-apply 'foldlevel' */ + case 'X': curwin->w_p_fen = TRUE; +! old_fdl = -1; /* force an update */ + break; + + /* "zm": fold more */ +--- 4936,4950 ---- + + /* "zx": re-apply 'foldlevel' and open folds at the cursor */ + case 'x': curwin->w_p_fen = TRUE; +! curwin->w_foldinvalid = TRUE; /* recompute folds */ +! newFoldLevel(); /* update right now */ + foldOpenCursor(); + break; + + /* "zX": undo manual opens/closes, re-apply 'foldlevel' */ + case 'X': curwin->w_p_fen = TRUE; +! curwin->w_foldinvalid = TRUE; /* recompute folds */ +! old_fdl = -1; /* force an update */ + break; + + /* "zm": fold more */ +*** ../vim-7.2.420/src/version.c 2010-05-13 16:46:16.000000000 +0200 +--- src/version.c 2010-05-13 17:33:34.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 421, + /**/ + +-- +My sister Cecilia opened a computer store in Hawaii. +She sells C shells by the seashore. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.422 +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.422 +Problem: May get E763 when using spell dictionaries. +Solution: Avoid utf-8 case folded character to be truncated to 8 bits and + differ from latin1. (Dominique Pelle) +Files: src/spell.c + + +*** ../vim-7.2.421/src/spell.c 2010-01-19 13:06:42.000000000 +0100 +--- src/spell.c 2010-05-13 17:29:28.000000000 +0200 +*************** +*** 9780,9789 **** + { + for (i = 128; i < 256; ++i) + { + spelltab.st_isu[i] = utf_isupper(i); + spelltab.st_isw[i] = spelltab.st_isu[i] || utf_islower(i); +! spelltab.st_fold[i] = utf_fold(i); +! spelltab.st_upper[i] = utf_toupper(i); + } + } + else +--- 9780,9795 ---- + { + for (i = 128; i < 256; ++i) + { ++ int f = utf_fold(i); ++ int u = utf_toupper(i); ++ + spelltab.st_isu[i] = utf_isupper(i); + spelltab.st_isw[i] = spelltab.st_isu[i] || utf_islower(i); +! /* The folded/upper-cased value is different between latin1 and +! * utf8 for 0xb5, causing E763 for no good reason. Use the latin1 +! * value for utf-8 to avoid this. */ +! spelltab.st_fold[i] = (f < 256) ? f : i; +! spelltab.st_upper[i] = (u < 256) ? u : i; + } + } + else +*** ../vim-7.2.421/src/version.c 2010-05-13 17:35:52.000000000 +0200 +--- src/version.c 2010-05-13 17:46:03.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 422, + /**/ + +-- +Q. What happens to programmers when they die? +A: MS-Windows programmers are reinstalled. C++ programmers become undefined, + anyone who refers to them will die as well. Java programmers reincarnate + after being garbage collected. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.423 +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.423 +Problem: Crash when assigning s: to variable. (Yukihiro Nakadaira) +Solution: Make ga_scripts contain pointer to scriptvar_T instead of + scriptvar_T itself. (Dominique Pelle) +Files: src/eval.c + + +*** ../vim-7.2.422/src/eval.c 2010-03-17 19:53:44.000000000 +0100 +--- src/eval.c 2010-05-14 12:02:16.000000000 +0200 +*************** +*** 145,153 **** + dict_T sv_dict; + } scriptvar_T; + +! static garray_T ga_scripts = {0, 0, sizeof(scriptvar_T), 4, NULL}; +! #define SCRIPT_SV(id) (((scriptvar_T *)ga_scripts.ga_data)[(id) - 1]) +! #define SCRIPT_VARS(id) (SCRIPT_SV(id).sv_dict.dv_hashtab) + + static int echo_attr = 0; /* attributes used for ":echo" */ + +--- 145,153 ---- + dict_T sv_dict; + } scriptvar_T; + +! static garray_T ga_scripts = {0, 0, sizeof(scriptvar_T *), 4, NULL}; +! #define SCRIPT_SV(id) (((scriptvar_T **)ga_scripts.ga_data)[(id) - 1]) +! #define SCRIPT_VARS(id) (SCRIPT_SV(id)->sv_dict.dv_hashtab) + + static int echo_attr = 0; /* attributes used for ":echo" */ + +*************** +*** 866,875 **** + hash_init(&vimvarht); /* garbage_collect() will access it */ + hash_clear(&compat_hashtab); + +- /* script-local variables */ +- for (i = 1; i <= ga_scripts.ga_len; ++i) +- vars_clear(&SCRIPT_VARS(i)); +- ga_clear(&ga_scripts); + free_scriptnames(); + + /* global variables */ +--- 866,871 ---- +*************** +*** 878,883 **** +--- 874,887 ---- + /* autoloaded script names */ + ga_clear_strings(&ga_loaded); + ++ /* script-local variables */ ++ for (i = 1; i <= ga_scripts.ga_len; ++i) ++ { ++ vars_clear(&SCRIPT_VARS(i)); ++ vim_free(SCRIPT_SV(i)); ++ } ++ ga_clear(&ga_scripts); ++ + /* unreferenced lists and dicts */ + (void)garbage_collect(); + +*************** +*** 18803,18809 **** + /* Must be something like "s:", otherwise "ht" would be NULL. */ + switch (varname[-2]) + { +! case 's': return &SCRIPT_SV(current_SID).sv_var; + case 'g': return &globvars_var; + case 'v': return &vimvars_var; + case 'b': return &curbuf->b_bufvar; +--- 18807,18813 ---- + /* Must be something like "s:", otherwise "ht" would be NULL. */ + switch (varname[-2]) + { +! case 's': return &SCRIPT_SV(current_SID)->sv_var; + case 'g': return &globvars_var; + case 'v': return &vimvars_var; + case 'b': return &curbuf->b_bufvar; +*************** +*** 18928,18940 **** + ht = &SCRIPT_VARS(i); + if (ht->ht_mask == HT_INIT_SIZE - 1) + ht->ht_array = ht->ht_smallarray; +! sv = &SCRIPT_SV(i); + sv->sv_var.di_tv.vval.v_dict = &sv->sv_dict; + } + + while (ga_scripts.ga_len < id) + { +! sv = &SCRIPT_SV(ga_scripts.ga_len + 1); + init_var_dict(&sv->sv_dict, &sv->sv_var); + ++ga_scripts.ga_len; + } +--- 18932,18945 ---- + ht = &SCRIPT_VARS(i); + if (ht->ht_mask == HT_INIT_SIZE - 1) + ht->ht_array = ht->ht_smallarray; +! sv = SCRIPT_SV(i); + sv->sv_var.di_tv.vval.v_dict = &sv->sv_dict; + } + + while (ga_scripts.ga_len < id) + { +! sv = SCRIPT_SV(ga_scripts.ga_len + 1) = +! (scriptvar_T *)alloc_clear(sizeof(scriptvar_T)); + init_var_dict(&sv->sv_dict, &sv->sv_var); + ++ga_scripts.ga_len; + } +*************** +*** 21931,21937 **** + if (find_viminfo_parameter('!') == NULL) + return; + +! fprintf(fp, _("\n# global variables:\n")); + + todo = (int)globvarht.ht_used; + for (hi = globvarht.ht_array; todo > 0; ++hi) +--- 21936,21942 ---- + if (find_viminfo_parameter('!') == NULL) + return; + +! fputs(_("\n# global variables:\n"), fp); + + todo = (int)globvarht.ht_used; + for (hi = globvarht.ht_array; todo > 0; ++hi) +*** ../vim-7.2.422/src/version.c 2010-05-13 17:46:53.000000000 +0200 +--- src/version.c 2010-05-14 12:13:19.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 423, + /**/ + +-- +He who laughs last, thinks slowest. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.424 +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.424 +Problem: ":colorscheme" without an argument doesn't do anything. +Solution: Make it echo the current color scheme name. (partly by Christian + Brabandt) +Files: runtime/doc/syntax.txt, src/ex_cmds.h, src/ex_docmd.c + + +*** ../vim-7.2.423/runtime/doc/syntax.txt 2008-08-09 19:36:52.000000000 +0200 +--- runtime/doc/syntax.txt 2010-05-14 15:27:47.000000000 +0200 +*************** +*** 113,118 **** +--- 113,121 ---- + :syntax off $VIMRUNTIME/syntax/nosyntax.vim + Also see |syntax-loading|. + ++ NOTE: If displaying long lines is slow and switching off syntax highlighting ++ makes it fast, consider setting the 'synmaxcol' option to a lower value. ++ + ============================================================================== + 2. Syntax files *:syn-files* + +*************** +*** 3829,3841 **** + in their own color. + + *:colo* *:colorscheme* *E185* + :colo[rscheme] {name} Load color scheme {name}. This searches 'runtimepath' + for the file "colors/{name}.vim. The first one that + is found is loaded. +! To see the name of the currently active color scheme +! (if there is one): > +! :echo g:colors_name +! < Doesn't work recursively, thus you can't use + ":colorscheme" in a color scheme script. + After the color scheme has been loaded the + |ColorScheme| autocommand event is triggered. +--- 3871,3890 ---- + in their own color. + + *:colo* *:colorscheme* *E185* ++ :colo[rscheme] Output the name of the currently active color scheme. ++ This is basically the same as > ++ :echo g:colors_name ++ < In case g:colors_name has not been defined :colo will ++ output "default". When compiled without the |+eval| ++ feature it will output "unknown". ++ + :colo[rscheme] {name} Load color scheme {name}. This searches 'runtimepath' + for the file "colors/{name}.vim. The first one that + is found is loaded. +! To see the name of the currently active color scheme: > +! :colo +! < The name is also stored in the g:colors_name variable. +! Doesn't work recursively, thus you can't use + ":colorscheme" in a color scheme script. + After the color scheme has been loaded the + |ColorScheme| autocommand event is triggered. +*************** +*** 4032,4038 **** + colors. + When a colorscheme is being used, changing 'background' causes it to + be reloaded, which may reset all colors (including Normal). First +! delete the "colors_name" variable when you don't want this. + + When you have set "ctermfg" or "ctermbg" for the Normal group, Vim + needs to reset the color when exiting. This is done with the "op" +--- 4081,4087 ---- + colors. + When a colorscheme is being used, changing 'background' causes it to + be reloaded, which may reset all colors (including Normal). First +! delete the "g:colors_name" variable when you don't want this. + + When you have set "ctermfg" or "ctermbg" for the Normal group, Vim + needs to reset the color when exiting. This is done with the "op" +*** ../vim-7.2.423/src/ex_cmds.h 2010-05-13 16:46:16.000000000 +0200 +--- src/ex_cmds.h 2010-05-14 13:08:45.000000000 +0200 +*************** +*** 256,262 **** + EX(CMD_colder, "colder", qf_age, + RANGE|NOTADR|COUNT|TRLBAR), + EX(CMD_colorscheme, "colorscheme", ex_colorscheme, +! NEEDARG|WORD1|TRLBAR|CMDWIN), + EX(CMD_command, "command", ex_command, + EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN), + EX(CMD_comclear, "comclear", ex_comclear, +--- 256,262 ---- + EX(CMD_colder, "colder", qf_age, + RANGE|NOTADR|COUNT|TRLBAR), + EX(CMD_colorscheme, "colorscheme", ex_colorscheme, +! WORD1|TRLBAR|CMDWIN), + EX(CMD_command, "command", ex_command, + EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN), + EX(CMD_comclear, "comclear", ex_comclear, +*** ../vim-7.2.423/src/ex_docmd.c 2010-03-02 15:55:51.000000000 +0100 +--- src/ex_docmd.c 2010-05-14 15:26:14.000000000 +0200 +*************** +*** 6226,6232 **** + ex_colorscheme(eap) + exarg_T *eap; + { +! if (load_colors(eap->arg) == FAIL) + EMSG2(_("E185: Cannot find color scheme %s"), eap->arg); + } + +--- 6226,6256 ---- + ex_colorscheme(eap) + exarg_T *eap; + { +! if (*eap->arg == NUL) +! { +! #ifdef FEAT_EVAL +! char_u *expr = vim_strsave((char_u *)"g:colors_name"); +! char_u *p = NULL; +! +! if (expr != NULL) +! { +! ++emsg_off; +! p = eval_to_string(expr, NULL, FALSE); +! --emsg_off; +! vim_free(expr); +! } +! if (p != NULL) +! { +! MSG(p); +! vim_free(p); +! } +! else +! MSG("default"); +! #else +! MSG(_("unknown")); +! #endif +! } +! else if (load_colors(eap->arg) == FAIL) + EMSG2(_("E185: Cannot find color scheme %s"), eap->arg); + } + +*** ../vim-7.2.423/src/version.c 2010-05-14 12:16:19.000000000 +0200 +--- src/version.c 2010-05-14 15:23:20.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 424, + /**/ + +-- +Everyone has a photographic memory. Some don't have film. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.425 +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.425 +Problem: Some compilers complain about fourth EX() argument. +Solution: Add cast to long_u. +Files: src/ex_cmds.h + + +*** ../vim-7.2.424/src/ex_cmds.h 2010-05-14 15:28:37.000000000 +0200 +--- src/ex_cmds.h 2010-05-14 13:08:45.000000000 +0200 +*************** +*** 74,80 **** + # undef EX /* just in case */ + #endif + #ifdef DO_DECLARE_EXCMD +! # define EX(a, b, c, d) {(char_u *)b, c, d} + + typedef void (*ex_func_T) __ARGS((exarg_T *eap)); + +--- 74,80 ---- + # undef EX /* just in case */ + #endif + #ifdef DO_DECLARE_EXCMD +! # define EX(a, b, c, d) {(char_u *)b, c, (long_u)(d)} + + typedef void (*ex_func_T) __ARGS((exarg_T *eap)); + +*** ../vim-7.2.424/src/version.c 2010-05-14 15:28:37.000000000 +0200 +--- src/version.c 2010-05-14 15:42:23.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 425, + /**/ + +-- +The users that I support would double-click on a landmine to find out +what happens. -- A system administrator + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.426 +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.426 +Problem: Commas in 'langmap' are not always handled correctly. +Solution: Require commas to be backslash escaped. (James Vega) +Files: src/option.c + + +*** ../vim-7.2.425/src/option.c 2010-05-13 13:12:01.000000000 +0200 +--- src/option.c 2010-05-14 16:04:21.000000000 +0200 +*************** +*** 10432,10437 **** +--- 10432,10442 ---- + p2 = NULL; /* aAbBcCdD form, p2 is NULL */ + while (p[0]) + { ++ if (p[0] == ',') ++ { ++ ++p; ++ break; ++ } + if (p[0] == '\\' && p[1] != NUL) + ++p; + #ifdef FEAT_MBYTE +*************** +*** 10439,10464 **** + #else + from = p[0]; + #endif + if (p2 == NULL) + { + mb_ptr_adv(p); +! if (p[0] == '\\') +! ++p; + #ifdef FEAT_MBYTE +! to = (*mb_ptr2char)(p); + #else +! to = p[0]; + #endif + } + else + { +! if (p2[0] == '\\') +! ++p2; + #ifdef FEAT_MBYTE +! to = (*mb_ptr2char)(p2); + #else +! to = p2[0]; + #endif + } + if (to == NUL) + { +--- 10444,10476 ---- + #else + from = p[0]; + #endif ++ to = NUL; + if (p2 == NULL) + { + mb_ptr_adv(p); +! if (p[0] != ',') +! { +! if (p[0] == '\\') +! ++p; + #ifdef FEAT_MBYTE +! to = (*mb_ptr2char)(p); + #else +! to = p[0]; + #endif ++ } + } + else + { +! if (p2[0] != ',') +! { +! if (p2[0] == '\\') +! ++p2; + #ifdef FEAT_MBYTE +! to = (*mb_ptr2char)(p2); + #else +! to = p2[0]; + #endif ++ } + } + if (to == NUL) + { +*************** +*** 10476,10490 **** + + /* Advance to next pair */ + mb_ptr_adv(p); +! if (p2 == NULL) +! { +! if (p[0] == ',') +! { +! ++p; +! break; +! } +! } +! else + { + mb_ptr_adv(p2); + if (*p == ';') +--- 10488,10494 ---- + + /* Advance to next pair */ + mb_ptr_adv(p); +! if (p2 != NULL) + { + mb_ptr_adv(p2); + if (*p == ';') +*** ../vim-7.2.425/src/version.c 2010-05-14 15:42:49.000000000 +0200 +--- src/version.c 2010-05-14 17:32:11.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 426, + /**/ + +-- +On the other hand, you have different fingers. + -- Steven Wright + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.427 +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.427 +Problem: The swapfile is created using the destination of a symlink, but + recovery doesn't follow symlinks. +Solution: When recovering, resolve symlinks. (James Vega) +Files: src/memline.c + + +*** ../vim-7.2.426/src/memline.c 2010-03-10 14:46:21.000000000 +0100 +--- src/memline.c 2010-05-14 17:28:29.000000000 +0200 +*************** +*** 245,250 **** +--- 245,253 ---- + #ifdef FEAT_BYTEOFF + static void ml_updatechunk __ARGS((buf_T *buf, long line, long len, int updtype)); + #endif ++ #ifdef HAVE_READLINK ++ static int resolve_symlink __ARGS((char_u *fname, char_u *buf)); ++ #endif + + /* + * Open a new memline for "buf". +*************** +*** 1401,1410 **** + int i; + char_u *dirp; + char_u *dir_name; + + if (list) + { +! /* use msg() to start the scrolling properly */ + msg((char_u *)_("Swap files found:")); + msg_putchar('\n'); + } +--- 1404,1422 ---- + 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) + { +! /* use msg() to start the scrolling properly */ + msg((char_u *)_("Swap files found:")); + msg_putchar('\n'); + } +*************** +*** 1453,1459 **** + #endif + } + else +! num_names = recov_file_names(names, *fname, TRUE); + } + else /* check directory dir_name */ + { +--- 1465,1471 ---- + #endif + } + else +! num_names = recov_file_names(names, fname_res, TRUE); + } + else /* check directory dir_name */ + { +*************** +*** 1490,1501 **** + if (after_pathsep(dir_name, p) && p[-1] == p[-2]) + { + /* Ends with '//', Use Full path for swap name */ +! tail = make_percent_swname(dir_name, *fname); + } + else + #endif + { +! tail = gettail(*fname); + tail = concat_fnames(dir_name, tail, TRUE); + } + if (tail == NULL) +--- 1502,1513 ---- + if (after_pathsep(dir_name, p) && p[-1] == p[-2]) + { + /* Ends with '//', Use Full path for swap name */ +! tail = make_percent_swname(dir_name, fname_res); + } + else + #endif + { +! tail = gettail(fname_res); + tail = concat_fnames(dir_name, tail, TRUE); + } + if (tail == NULL) +*************** +*** 1535,1545 **** + struct stat st; + char_u *swapname; + + #if defined(VMS) || defined(RISCOS) +! swapname = modname(*fname, (char_u *)"_swp", FALSE); + #else +! swapname = modname(*fname, (char_u *)".swp", TRUE); + #endif + if (swapname != NULL) + { + if (mch_stat((char *)swapname, &st) != -1) /* It exists! */ +--- 1547,1559 ---- + struct stat st; + char_u *swapname; + ++ swapname = modname(fname_res, + #if defined(VMS) || defined(RISCOS) +! (char_u *)"_swp", FALSE + #else +! (char_u *)".swp", TRUE + #endif ++ ); + if (swapname != NULL) + { + if (mch_stat((char *)swapname, &st) != -1) /* It exists! */ +*************** +*** 3508,3515 **** + } + + #ifdef HAVE_READLINK +- static int resolve_symlink __ARGS((char_u *fname, char_u *buf)); +- + /* + * Resolve a symlink in the last component of a file name. + * Note that f_resolve() does it for every part of the path, we don't do that +--- 3522,3527 ---- +*************** +*** 3601,3609 **** + char_u *dir_name; + { + char_u *r, *s; + #ifdef HAVE_READLINK + char_u fname_buf[MAXPATHL]; +- char_u *fname_res; + #endif + + #if defined(UNIX) || defined(WIN3264) /* Need _very_ long file names */ +--- 3613,3621 ---- + char_u *dir_name; + { + char_u *r, *s; ++ char_u *fname_res = fname; + #ifdef HAVE_READLINK + char_u fname_buf[MAXPATHL]; + #endif + + #if defined(UNIX) || defined(WIN3264) /* Need _very_ long file names */ +*************** +*** 3625,3632 **** + * actual file instead of with the symlink. */ + if (resolve_symlink(fname, fname_buf) == OK) + fname_res = fname_buf; +- else +- fname_res = fname; + #endif + + r = buf_modname( +--- 3637,3642 ---- +*************** +*** 3639,3649 **** + /* Avoid problems if fname has special chars, eg <Wimp$Scrap> */ + ffname, + #else +- # ifdef HAVE_READLINK + fname_res, +- # else +- fname, +- # endif + #endif + (char_u *) + #if defined(VMS) || defined(RISCOS) +--- 3649,3655 ---- +*** ../vim-7.2.426/src/version.c 2010-05-14 17:32:53.000000000 +0200 +--- src/version.c 2010-05-14 17:50:43.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 427, + /**/ + +-- +Change is inevitable, except from a vending machine. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.428 +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.428 +Problem: Using setqflist([]) to clear the error list doesn't work properly. +Solution: Set qf_nonevalid to TRUE when appropriate. (Christian Brabandt) +Files: src/quickfix.c + + +*** ../vim-7.2.427/src/quickfix.c 2010-01-19 14:59:14.000000000 +0100 +--- src/quickfix.c 2010-05-14 18:06:27.000000000 +0200 +*************** +*** 3654,3660 **** + } + } + +! qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE; + qi->qf_lists[qi->qf_curlist].qf_ptr = qi->qf_lists[qi->qf_curlist].qf_start; + qi->qf_lists[qi->qf_curlist].qf_index = 1; + +--- 3654,3664 ---- + } + } + +! if (qi->qf_lists[qi->qf_curlist].qf_index == 0) +! /* empty list or no valid entry */ +! qi->qf_lists[qi->qf_curlist].qf_nonevalid = TRUE; +! else +! qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE; + qi->qf_lists[qi->qf_curlist].qf_ptr = qi->qf_lists[qi->qf_curlist].qf_start; + qi->qf_lists[qi->qf_curlist].qf_index = 1; + +*** ../vim-7.2.427/src/version.c 2010-05-14 17:52:35.000000000 +0200 +--- src/version.c 2010-05-14 18:09:32.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 428, + /**/ + +-- +Seen it all, done it all, can't remember most of it. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.429 +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.429 +Problem: A file that exists but access is denied may result in a "new file" + message. E.g. when its directory is unreadable. +Solution: Specifically check for ENOENT to decide a file doesn't exist. + (partly by James Vega) +Files: src/fileio.c + + +*** ../vim-7.2.428/src/fileio.c 2010-03-02 12:47:58.000000000 +0100 +--- src/fileio.c 2010-05-14 18:30:09.000000000 +0200 +*************** +*** 595,601 **** + #endif + if (newfile) + { +! if (perm < 0) + { + /* + * Set the 'new-file' flag, so that when the file has +--- 595,605 ---- + #endif + if (newfile) + { +! if (perm < 0 +! #ifdef ENOENT +! && errno == ENOENT +! #endif +! ) + { + /* + * Set the 'new-file' flag, so that when the file has +*************** +*** 664,669 **** +--- 668,676 ---- + # ifdef EFBIG + (errno == EFBIG) ? _("[File too big]") : + # endif ++ # ifdef EOVERFLOW ++ (errno == EOVERFLOW) ? _("[File too big]") : ++ # endif + _("[Permission Denied]")), 0); + curbuf->b_p_ro = TRUE; /* must use "w!" now */ + } +*** ../vim-7.2.428/src/version.c 2010-05-14 18:10:23.000000000 +0200 +--- src/version.c 2010-05-14 18:55:11.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 429, + /**/ + +-- +Those who live by the sword get shot by those who don't. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.430 +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.430 +Problem: The ++bad argument is handled wrong, resulting in an invalid + memory access. +Solution: Use the bad_char field only for the replacement character, add + bad_char_idx to store the position. (Dominique Pelle) +Files: src/eval.c, src/ex_cmds.h, src/ex_docmd.c + + +*** ../vim-7.2.429/src/eval.c 2010-05-14 12:16:19.000000000 +0200 +--- src/eval.c 2010-05-14 19:04:53.000000000 +0200 +*************** +*** 18309,18316 **** + # ifdef FEAT_MBYTE + if (eap->force_enc != 0) + len += (unsigned)STRLEN(eap->cmd + eap->force_enc) + 7; +! if (eap->bad_char != 0) +! len += (unsigned)STRLEN(eap->cmd + eap->bad_char) + 7; + # endif + + newval = alloc(len + 1); +--- 18309,18316 ---- + # ifdef FEAT_MBYTE + if (eap->force_enc != 0) + len += (unsigned)STRLEN(eap->cmd + eap->force_enc) + 7; +! if (eap->bad_char_idx != 0) +! len += (unsigned)STRLEN(eap->cmd + eap->bad_char_idx) + 7; + # endif + + newval = alloc(len + 1); +*************** +*** 18334,18342 **** + if (eap->force_enc != 0) + sprintf((char *)newval + STRLEN(newval), " ++enc=%s", + eap->cmd + eap->force_enc); +! if (eap->bad_char != 0) + sprintf((char *)newval + STRLEN(newval), " ++bad=%s", +! eap->cmd + eap->bad_char); + # endif + vimvars[VV_CMDARG].vv_str = newval; + return oldval; +--- 18334,18342 ---- + if (eap->force_enc != 0) + sprintf((char *)newval + STRLEN(newval), " ++enc=%s", + eap->cmd + eap->force_enc); +! if (eap->bad_char_idx != 0) + sprintf((char *)newval + STRLEN(newval), " ++bad=%s", +! eap->cmd + eap->bad_char_idx); + # endif + vimvars[VV_CMDARG].vv_str = newval; + return oldval; +*** ../vim-7.2.429/src/ex_cmds.h 2010-05-14 15:42:49.000000000 +0200 +--- src/ex_cmds.h 2010-05-14 20:23:20.000000000 +0200 +*************** +*** 1152,1158 **** + int force_ff; /* ++ff= argument (index in cmd[]) */ + #ifdef FEAT_MBYTE + int force_enc; /* ++enc= argument (index in cmd[]) */ +! int bad_char; /* ++bad= argument (index in cmd[]) */ + #endif + #ifdef FEAT_USR_CMDS + int useridx; /* user command index */ +--- 1152,1159 ---- + int force_ff; /* ++ff= argument (index in cmd[]) */ + #ifdef FEAT_MBYTE + int force_enc; /* ++enc= argument (index in cmd[]) */ +! int bad_char_idx; /* ++bad= argument (index in cmd[]) */ +! int bad_char; /* BAD_KEEP, BAD_DROP or replacement char */ + #endif + #ifdef FEAT_USR_CMDS + int useridx; /* user command index */ +*** ../vim-7.2.429/src/ex_docmd.c 2010-05-14 15:28:37.000000000 +0200 +--- src/ex_docmd.c 2010-05-14 19:04:53.000000000 +0200 +*************** +*** 4739,4745 **** + else if (STRNCMP(arg, "bad", 3) == 0) + { + arg += 3; +! pp = &eap->bad_char; + } + #endif + +--- 4739,4745 ---- + else if (STRNCMP(arg, "bad", 3) == 0) + { + arg += 3; +! pp = &eap->bad_char_idx; + } + #endif + +*************** +*** 4770,4776 **** + { + /* Check ++bad= argument. Must be a single-byte character, "keep" or + * "drop". */ +! p = eap->cmd + eap->bad_char; + if (STRICMP(p, "keep") == 0) + eap->bad_char = BAD_KEEP; + else if (STRICMP(p, "drop") == 0) +--- 4770,4776 ---- + { + /* Check ++bad= argument. Must be a single-byte character, "keep" or + * "drop". */ +! p = eap->cmd + eap->bad_char_idx; + if (STRICMP(p, "keep") == 0) + eap->bad_char = BAD_KEEP; + else if (STRICMP(p, "drop") == 0) +*** ../vim-7.2.429/src/version.c 2010-05-14 18:56:33.000000000 +0200 +--- src/version.c 2010-05-14 20:39:38.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 430, + /**/ + +-- +You have the right to remain silent. Anything you say will be +misquoted, then used against you. + + /// 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 /// +To: [email protected] +Subject: Patch 7.2.431 +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.431 +Problem: ":amenu" moves the cursor when in Insert mode. +Solution: Use CTRL-\ CTRL-O instead of CTRL-O. (Christian Brabandt) +Files: src/menu.c + + +*** ../vim-7.2.430/src/menu.c 2009-05-17 13:30:58.000000000 +0200 +--- src/menu.c 2010-05-14 21:18:00.000000000 +0200 +*************** +*** 490,495 **** +--- 490,496 ---- + char_u *next_name; + int i; + int c; ++ int d; + #ifdef FEAT_GUI + int idx; + int new_idx; +*************** +*** 746,751 **** +--- 747,753 ---- + * Don't do this if adding a tearbar (addtearoff == FALSE). + * Don't do this for "<Nop>". */ + c = 0; ++ d = 0; + if (amenu && call_data != NULL && *call_data != NUL + #ifdef FEAT_GUI_W32 + && addtearoff +*************** +*** 761,778 **** + c = Ctrl_C; + break; + case MENU_INSERT_MODE: +! c = Ctrl_O; + break; + } + } + +! if (c) + { +! menu->strings[i] = alloc((unsigned)(STRLEN(call_data) + 4)); + if (menu->strings[i] != NULL) + { + menu->strings[i][0] = c; +! STRCPY(menu->strings[i] + 1, call_data); + if (c == Ctrl_C) + { + int len = (int)STRLEN(menu->strings[i]); +--- 763,787 ---- + c = Ctrl_C; + break; + case MENU_INSERT_MODE: +! c = Ctrl_BSL; +! d = Ctrl_O; + break; + } + } + +! if (c != 0) + { +! menu->strings[i] = alloc((unsigned)(STRLEN(call_data) + 5 )); + if (menu->strings[i] != NULL) + { + menu->strings[i][0] = c; +! if (d == 0) +! STRCPY(menu->strings[i] + 1, call_data);
Lines of this file are not shown. View the raw message.
meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch new file +17 -0
Lines of this file are not shown. View the raw message.
meta-oe/recipes-support/vim/files/vimrc new file +96 -0
96 lines not on this page · raw message
meta-oe/recipes-support/vim/gvim_7.2.446.bb new file +10 -0
Lines of this file are not shown. View the raw message.
meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb new file +5 -0
Lines of this file are not shown. View the raw message.
meta-oe/recipes-support/vim/vim.inc new file +77 -0
77 lines not on this page · raw message
meta-oe/recipes-support/vim/vim_7.2.446.bb new file +41 -0
41 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.3.4
Part of the diff is not shown here. View the raw message.
Dear Michael,
Am Montag, den 18.04.2011, 21:32 +0200 schrieb Michael Lippautz:
Quoted 4 lines
Re-import of vim/gvim/vim-tiny and wget.
* Clean vim recipe and update to 7.2.446 (446=patchset)
* Clean wget (ssl check usingstaging_dir)
could you first (or also) submit these patches to the “old” OpenEmbedded repository? I think this would make it easier to track/compare the recipes.
[…]
Thanks,
Paul
Koen Kooi
Applied-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 8 lines · Michael Lippautz
Re-import of vim/gvim/vim-tiny and wget.
* Clean vim recipe and update to 7.2.446 (446=patchset)
* Clean wget (ssl check usingstaging_dir)Pull URL:
git://gitorious.org/oe-zoid/meta-openembedded.git
Branch: master
Browse: http://gitorious.org/oe-zoid/meta-openembedded/commits/master
merged, thanks
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFNrVTfMkyGM64RGpERAvWKAKC42t0l/m7qEQm8Ifp19yyol4OGcACcCKFi jvD3xecu+T2cMZoyx+QK1fY=
=sFkX
-----END PGP SIGNATURE-----
2011/4/19 Koen Kooi <[email protected]>:
Quoted 6 lines
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Quoted 2 lines · Michael Lippautz
Re-import of vim/gvim/vim-tiny and wget.
Quoted 8 lines
Quoted 6 lines
* Clean vim recipe and update to 7.2.446 (446=patchset)
* Clean wget (ssl check usingstaging_dir)Pull URL:
git://gitorious.org/oe-zoid/meta-openembedded.git
Branch: master
Browse: http://gitorious.org/oe-zoid/meta-openembedded/commits/mastermerged, thanks
Thanks for correcting the space escape ...
I also didn't know that meta-oe doesn't care about distro overrides anymore.
-michael
Quoted 14 lines
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)iD8DBQFNrVTfMkyGM64RGpERAvWKAKC42t0l/m7qEQm8Ifp19yyol4OGcACcCKFi jvD3xecu+T2cMZoyx+QK1fY=
=sFkX
-----END PGP SIGNATURE-----_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 4 lines · Michael Lippautz
2011/4/19 Koen Kooi <[email protected]>:
Quoted 2 lines · Michael Lippautz
Quoted 2 lines
Quoted 2 lines
Re-import of vim/gvim/vim-tiny and wget.
Quoted 12 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
* Clean vim recipe and update to 7.2.446 (446=patchset)
* Clean wget (ssl check usingstaging_dir)Pull URL:
git://gitorious.org/oe-zoid/meta-openembedded.git
Branch: master
Browse: http://gitorious.org/oe-zoid/meta-openembedded/commits/mastermerged, thanks
Quoted 3 lines
Thanks for correcting the space escape ...
I also didn't know that meta-oe doesn't care about distro overrides anymore.
All distro overrides should be done in their respective layer (e.g. meta-angstrom, meta-shr). Just like machine overrides should be done in their respective layers.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFNrXUcMkyGM64RGpERAgwzAJ4yuuPnc2hhGLDYYdsxFdDs4tlpfQCffBj+ Ly1EwHhJQovVAvb0yIiG9a0=
=PE5X
-----END PGP SIGNATURE-----