http://blog.gmane.org/gmane.editors.vim.devel hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://comments.gmane.org/gmane.editors.vim.devel/40702 <pre>Hi list. There are tests failed on DOS/Windows environment. I have fixed two of them. Please check attached patches. test50: Short name seems depending on OS version. On my Win7, "c:/x.x.y" has short name "c:/XX9B80~1.Y", it will not be matched. So I made it flexible. test77: failed when "cksum" available (MinGW or Cygwin). Best. </pre> Taro MURAOKA 2013-06-18T00:03:02 http://comments.gmane.org/gmane.editors.vim.devel/40700 <pre> Patch 7.3.1220 Problem: MS-Windows: When using wide font italic and bold are not included. Solution: Support wide-bold, wide-italic and wide-bold-italic. (Ken Takata, Taro Muraoka) Files: src/gui.c, src/gui.h, src/gui_w48.c *** ../vim-7.3.1219/src/gui.c2013-06-12 20:35:46.000000000 +0200 --- src/gui.c2013-06-17 22:22:49.000000000 +0200 *************** *** 410,415 **** --- 410,423 ---- gui.fontset = NOFONTSET; # endif #endif + #ifdef FEAT_MBYTE + gui.wide_font = NOFONT; + # ifndef FEAT_GUI_GTK + gui.wide_bold_font = NOFONT; + gui.wide_ital_font = NOFONT; + gui.wide_boldital_font = NOFONT; + # endif + #endif #ifdef FEAT_MENU # ifndef FEAT_GUI_GTK *************** *** 1012,1017 **** --- 1020,1030 ---- gui.wide_font = font; # ifdef FEAT_GUI_MSWIN gui_mch_wide_font_changed(); + # else + /* + * TODO: setup wide_bold_font, wide_ital_font and wide_boldital_font to + * support those fonts for 'guifontwide'. + */ # endif return OK; } *************** *** 2180,2185 **** --- 2193,2201 ---- guicolor_Tsp_color; #if !defined(MSWIN16_FASTTEXT) &amp;&amp; !defined(FEAT_GUI_GTK) GuiFontfont = NOFONT; + # ifdef FEAT_MBYTE + GuiFontwide_font = NOFONT; + # endif # ifdef FEAT_XFONTSET GuiFontsetfontset = NOFONTSET; # endif *************** *** 2269,2274 **** --- 2285,2307 ---- } else font = gui.norm_font; + + # ifdef FEAT_MBYTE + /* + * Choose correct wide_font by font. wide_font should be set with font + * at same time in above block. But it will make many "ifdef" nasty + * blocks. So we do it here. + */ + if (font == gui.boldital_font &amp;&amp; gui.wide_boldital_font) + wide_font = gui.wide_boldital_font; + else if (font == gui.bold_font &amp;&amp; gui.wide_bold_font) + wide_font = gui.wide_bold_font; + else if (font == gui.ital_font &amp;&amp; gui.wide_ital_font) + wide_font = gui.wide_ital_font; + else if (font == gui.norm_font &amp;&amp; gui.wide_font) + wide_font = gui.wide_font; + # endif + } # ifdef FEAT_XFONTSET if (fontset != NOFONTSET) *************** *** 2407,2413 **** # ifdef FEAT_XFONTSET &amp;&amp; fontset == NOFONTSET # endif ! &amp;&amp; gui.wide_font != NOFONT) curr_wide = TRUE; else curr_wide = FALSE; --- 2440,2446 ---- # ifdef FEAT_XFONTSET &amp;&amp; fontset == NOFONTSET # endif ! &amp;&amp; wide_font != NOFONT) curr_wide = TRUE; else curr_wide = FALSE; *************** *** 2441,2447 **** if (thislen &gt; 0) { if (prev_wide) ! gui_mch_set_font(gui.wide_font); gui_mch_draw_string(gui.row, scol, s + start, thislen, draw_flags); if (prev_wide) --- 2474,2480 ---- if (thislen &gt; 0) { if (prev_wide) ! gui_mch_set_font(wide_font); gui_mch_draw_string(gui.row, scol, s + start, thislen, draw_flags); if (prev_wide) *** ../vim-7.3.1219/src/gui.h2013-01-23 13:40:54.000000000 +0100 --- src/gui.h2013-06-17 22:22:49.000000000 +0200 *************** *** 311,317 **** # endif #endif #ifdef FEAT_MBYTE ! GuiFontwide_font; /* 'guifontwide' font */ #endif #ifdef FEAT_XFONTSET GuiFontsetfontset; /* set of fonts for multi-byte chars */ --- 311,322 ---- # endif #endif #ifdef FEAT_MBYTE ! GuiFontwide_font; /* Normal 'guifontwide' font */ ! # ifndef FEAT_GUI_GTK ! GuiFontwide_bold_font; /* Bold 'guifontwide' font */ ! GuiFontwide_ital_font; /* Italic 'guifontwide' font */ ! GuiFontwide_boldital_font; /* Bold-Italic 'guifontwide' font */ ! # endif #endif #ifdef FEAT_XFONTSET GuiFontsetfontset; /* set of fonts for multi-byte chars */ *** ../vim-7.3.1219/src/gui_w48.c2013-05-06 04:21:35.000000000 +0200 --- src/gui_w48.c2013-06-17 22:22:49.000000000 +0200 *************** *** 3123,3131 **** --- 3123,3165 ---- void gui_mch_wide_font_changed() { + # ifndef MSWIN16_FASTTEXT + LOGFONT lf; + # endif + # ifdef FEAT_MBYTE_IME update_im_font(); # endif + + # ifndef MSWIN16_FASTTEXT + gui_mch_free_font(gui.wide_ital_font); + gui.wide_ital_font = NOFONT; + gui_mch_free_font(gui.wide_bold_font); + gui.wide_bold_font = NOFONT; + gui_mch_free_font(gui.wide_boldital_font); + gui.wide_boldital_font = NOFONT; + + if (gui.wide_font + &amp;&amp; GetObject((HFONT)gui.wide_font, sizeof(lf), &amp;lf)) + { + if (!lf.lfItalic) + { + lf.lfItalic = TRUE; + gui.wide_ital_font = get_font_handle(&amp;lf); + lf.lfItalic = FALSE; + } + if (lf.lfWeight &lt; FW_BOLD) + { + lf.lfWeight = FW_BOLD; + gui.wide_bold_font = get_font_handle(&amp;lf); + if (!lf.lfItalic) + { + lf.lfItalic = TRUE; + gui.wide_boldital_font = get_font_handle(&amp;lf); + } + } + } + # endif } #endif *** ../vim-7.3.1219/src/version.c2013-06-17 22:04:34.000000000 +0200 --- src/version.c2013-06-17 22:24:18.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1220, /**/ </pre> Bram Moolenaar 2013-06-17T20:43:46 http://comments.gmane.org/gmane.editors.vim.devel/40697 <pre> Patch 7.3.1219 Problem: No test for using []] inside \%[]. Solution: Add a test. Files: src/testdir/test64.in, src/testdir/test64.ok *** ../vim-7.3.1218/src/testdir/test64.in2013-06-17 21:33:36.000000000 +0200 --- src/testdir/test64.in2013-06-17 21:59:47.000000000 +0200 *************** *** 367,372 **** --- 367,373 ---- :call add(tl, [2, '\%[bar]x', 'bxx', 'bx']) :call add(tl, [2, '\%[bar]x', 'xxx', 'x']) :call add(tl, [2, 'b\%[[ao]r]', 'bar bor', 'bar']) + :call add(tl, [2, 'b\%[[]]r]', 'b]r bor', 'b]r']) :" :"""" Alternatives, must use first longest match :call add(tl, [2, 'goo\|go', 'google', 'goo']) *** ../vim-7.3.1218/src/testdir/test64.ok2013-06-17 21:33:36.000000000 +0200 --- src/testdir/test64.ok2013-06-17 21:59:51.000000000 +0200 *************** *** 839,844 **** --- 839,847 ---- OK 0 - b\%[[ao]r] OK 1 - b\%[[ao]r] OK 2 - b\%[[ao]r] + OK 0 - b\%[[]]r] + OK 1 - b\%[[]]r] + OK 2 - b\%[[]]r] OK 0 - goo\|go OK 1 - goo\|go OK 2 - goo\|go *** ../vim-7.3.1218/src/version.c2013-06-17 21:53:33.000000000 +0200 --- src/version.c2013-06-17 22:03:18.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1219, /**/ </pre> Bram Moolenaar 2013-06-17T20:05:03 http://comments.gmane.org/gmane.editors.vim.devel/40696 <pre> Patch 7.3.1218 Problem: "make test" on MS-Windows does not clean all temporary files and gives some unneccessary message. Solution: Clean the right files. Create .failed files. (Ken Takata) Files: src/testdir/Make_dos.mak *** ../vim-7.3.1217/src/testdir/Make_dos.mak2013-06-16 16:57:43.000000000 +0200 --- src/testdir/Make_dos.mak2013-06-17 21:49:44.000000000 +0200 *************** *** 61,66 **** --- 61,67 ---- clean: -del *.out + -del *.failed -if exist test.ok del test.ok -if exist small.vim del small.vim -if exist tiny.vim del tiny.vim *************** *** 68,85 **** -if exist mzscheme.vim del mzscheme.vim -if exist lua.vim del lua.vim -del X* -if exist viminfo del viminfo -del test.log .in.out: copy $*.ok test.ok $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in ! &lt; at &gt;diff test.out $*.ok &amp; if errorlevel 1 (echo $* FAILED &gt;&gt; test.log ) \ ! else ( del /F $*.out &amp; rename test.out $*.out ) -del X* - -del X*.* -del test.ok ! -rd /s /q Xfind -if exist viminfo del viminfo nolog: --- 69,90 ---- -if exist mzscheme.vim del mzscheme.vim -if exist lua.vim del lua.vim -del X* + -if exist Xdir1 rd /s /q Xdir1 + -if exist Xfind rd /s /q Xfind -if exist viminfo del viminfo -del test.log .in.out: + -if exist $*.failed del $*.failed copy $*.ok test.ok $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in ! &lt; at &gt;diff test.out $*.ok &amp; if errorlevel 1 \ ! ( move /y test.out $*.failed &amp; echo $* FAILED &gt;&gt; test.log ) \ ! else ( move /y test.out $*.out ) -del X* -del test.ok ! -if exist Xdir1 rd /s /q Xdir1 ! -if exist Xfind rd /s /q Xfind -if exist viminfo del viminfo nolog: *** ../vim-7.3.1217/src/version.c2013-06-17 21:33:36.000000000 +0200 --- src/version.c2013-06-17 21:52:02.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1218, /**/ </pre> Bram Moolenaar 2013-06-17T19:53:52 http://comments.gmane.org/gmane.editors.vim.devel/40693 <pre> Patch 7.3.1217 Problem: New regexp engine: Can't handle \%[[ao]]. (Yukihiro Nakadaira) Solution: Support nested atoms inside \%[]. Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok *** ../vim-7.3.1216/src/regexp_nfa.c2013-06-16 22:49:09.000000000 +0200 --- src/regexp_nfa.c2013-06-17 21:27:03.000000000 +0200 *************** *** 1150,1162 **** int n; /* \%[abc] */ ! for (n = 0; (c = getchr()) != ']'; ++n) { if (c == NUL) EMSG2_RET_FAIL(_(e_missing_sb), reg_magic == MAGIC_ALL); ! EMIT(c); } if (n == 0) EMSG2_RET_FAIL(_(e_empty_sb), reg_magic == MAGIC_ALL); --- 1150,1165 ---- int n; /* \%[abc] */ ! for (n = 0; (c = peekchr()) != ']'; ++n) { if (c == NUL) EMSG2_RET_FAIL(_(e_missing_sb), reg_magic == MAGIC_ALL); ! /* recursive call! */ ! if (nfa_regatom() == FAIL) ! return FAIL; } + getchr(); /* get the ] */ if (n == 0) EMSG2_RET_FAIL(_(e_empty_sb), reg_magic == MAGIC_ALL); *** ../vim-7.3.1216/src/testdir/test64.in2013-06-16 15:43:43.000000000 +0200 --- src/testdir/test64.in2013-06-17 21:21:35.000000000 +0200 *************** *** 366,371 **** --- 366,372 ---- :call add(tl, [2, '\%[bar]x', 'barxx', 'barx']) :call add(tl, [2, '\%[bar]x', 'bxx', 'bx']) :call add(tl, [2, '\%[bar]x', 'xxx', 'x']) + :call add(tl, [2, 'b\%[[ao]r]', 'bar bor', 'bar']) :" :"""" Alternatives, must use first longest match :call add(tl, [2, 'goo\|go', 'google', 'goo']) *** ../vim-7.3.1216/src/testdir/test64.ok2013-06-16 15:43:43.000000000 +0200 --- src/testdir/test64.ok2013-06-17 21:27:09.000000000 +0200 *************** *** 836,841 **** --- 836,844 ---- OK 0 - \%[bar]x OK 1 - \%[bar]x OK 2 - \%[bar]x + OK 0 - b\%[[ao]r] + OK 1 - b\%[[ao]r] + OK 2 - b\%[[ao]r] OK 0 - goo\|go OK 1 - goo\|go OK 2 - goo\|go *** ../vim-7.3.1216/src/version.c2013-06-17 20:27:13.000000000 +0200 --- src/version.c2013-06-17 21:20:10.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1217, /**/ </pre> Bram Moolenaar 2013-06-17T19:34:00 http://comments.gmane.org/gmane.editors.vim.devel/40690 <pre> Patch 7.3.1216 Problem: Configure can't find Motif on Ubuntu. Solution: Search for libXm in /usr/lib/*-linux-gnu. Files: src/configure.in, src/auto/configure *** ../vim-7.3.1215/src/configure.in2013-06-14 21:22:33.000000000 +0200 --- src/configure.in2013-06-17 20:15:13.000000000 +0200 *************** *** 2277,2284 **** dnl Remove "-L" from before $GUI_LIB_LOC if it's there GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`" AC_MSG_CHECKING(for location of Motif GUI libs) ! gui_libs="`echo $x_libraries|sed 's%/[^/][^/]*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC" GUI_LIB_LOC= for try in $gui_libs; do for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do --- 2277,2286 ---- dnl Remove "-L" from before $GUI_LIB_LOC if it's there GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`" + dnl Ubuntu has libXm.so in /usr/lib/i386-linux-gnu and elsewhere. The + dnl linker will figure out which one to use, we only check if one exists. AC_MSG_CHECKING(for location of Motif GUI libs) ! gui_libs="`echo $x_libraries|sed 's%/[^/][^/]*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC" GUI_LIB_LOC= for try in $gui_libs; do for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do *************** *** 2289,2295 **** done if test -n "$GUI_LIB_LOC"; then dnl Remove /usr/lib, it causes trouble on some systems ! if test "$GUI_LIB_LOC" = /usr/lib; then GUI_LIB_LOC= AC_MSG_RESULT(in default path) else --- 2291,2299 ---- done if test -n "$GUI_LIB_LOC"; then dnl Remove /usr/lib, it causes trouble on some systems ! if test "$GUI_LIB_LOC" = /usr/lib \ ! -o "$GUI_LIB_LOC" = /usr/lib/i386-linux-gnu \ ! -o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then GUI_LIB_LOC= AC_MSG_RESULT(in default path) else *** ../vim-7.3.1215/src/auto/configure2013-06-14 21:22:33.000000000 +0200 --- src/auto/configure2013-06-17 20:15:17.000000000 +0200 *************** *** 8346,8354 **** GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`" ! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI libs" &gt;&amp;5 $as_echo_n "checking for location of Motif GUI libs... " &gt;&amp;6; } ! gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC" GUI_LIB_LOC= for try in $gui_libs; do for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do --- 8346,8354 ---- GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`" ! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI libs" &gt;&amp;5 $as_echo_n "checking for location of Motif GUI libs... " &gt;&amp;6; } ! gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC" GUI_LIB_LOC= for try in $gui_libs; do for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do *************** *** 8358,8364 **** done done if test -n "$GUI_LIB_LOC"; then ! if test "$GUI_LIB_LOC" = /usr/lib; then GUI_LIB_LOC= { $as_echo "$as_me:${as_lineno-$LINENO}: result: in default path" &gt;&amp;5 $as_echo "in default path" &gt;&amp;6; } --- 8358,8366 ---- done done if test -n "$GUI_LIB_LOC"; then ! if test "$GUI_LIB_LOC" = /usr/lib \ ! -o "$GUI_LIB_LOC" = /usr/lib/i386-linux-gnu \ ! -o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then GUI_LIB_LOC= { $as_echo "$as_me:${as_lineno-$LINENO}: result: in default path" &gt;&amp;5 $as_echo "in default path" &gt;&amp;6; } *** ../vim-7.3.1215/src/version.c2013-06-17 19:26:29.000000000 +0200 --- src/version.c2013-06-17 20:06:50.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1216, /**/ </pre> Bram Moolenaar 2013-06-17T18:27:48 http://comments.gmane.org/gmane.editors.vim.devel/40689 <pre> Patch 7.3.1215 Problem: Compiler warning for function not defined. Solution: Add #ifdef. Files: src/misc1.c *** ../vim-7.3.1214/src/misc1.c2013-06-16 22:49:09.000000000 +0200 --- src/misc1.c2013-06-17 19:19:27.000000000 +0200 *************** *** 16,22 **** --- 16,24 ---- static char_u *vim_version_dir __ARGS((char_u *vimdir)); static char_u *remove_tail __ARGS((char_u *p, char_u *pend, char_u *name)); + #if defined(FEAT_CMDL_COMPL) static void init_users __ARGS((void)); + #endif static int copy_indent __ARGS((int size, char_u*src)); /* All user names (for ~user completion as done by shell). */ *** ../vim-7.3.1214/src/version.c2013-06-16 22:49:09.000000000 +0200 --- src/version.c2013-06-17 19:20:16.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1215, /**/ </pre> Bram Moolenaar 2013-06-17T17:27:03 http://comments.gmane.org/gmane.editors.vim.devel/40688 <pre>Hi list. Please see the following code. ---------- let dict = {} function dict['/foo']() endfunction " =&gt; E475: Invalid argument: /foo function dict['foo']() endfunction " OK. let dict['/foo'] = function('tr') function! dict['/foo']() endfunction " Overwrite is OK call dict['/foo']() " OK. ---------- I also expect ":function dict['/foo']()" to be ok. I write a patch and test for this. https://gist.github.com/thinca/5797391 However, I am not confident for this patch. Please check it. Regards. -- thinca &lt;thinca&lt; at &gt;gmail.com&gt; </pre> thinca 2013-06-17T14:54:47 http://comments.gmane.org/gmane.editors.vim.devel/40686 <pre>[] inside \%[] doesn't work with new regex engine. Steps to reproduce: $ vim -u NONE :echo match('a', '\%#=1\%[[a]]') 0 :echo match('a', '\%#=2\%[[a]]') INTERNAL: Negative state char: -165 INTERNAL: Negative state char: -165 -1 </pre> Yukihiro Nakadaira 2013-06-17T08:03:18 http://comments.gmane.org/gmane.editors.vim.devel/40680 <pre> Patch 7.3.1214 Problem: Missing declaration for init_users() and realloc_post_list(). (Salman Halim) Solution: Add the declarations. Files: src/misc1.c, src/regexp_nfa.c *** ../vim-7.3.1213/src/misc1.c2013-06-08 18:19:40.000000000 +0200 --- src/misc1.c2013-06-16 22:46:01.000000000 +0200 *************** *** 16,21 **** --- 16,22 ---- static char_u *vim_version_dir __ARGS((char_u *vimdir)); static char_u *remove_tail __ARGS((char_u *p, char_u *pend, char_u *name)); + static void init_users __ARGS((void)); static int copy_indent __ARGS((int size, char_u*src)); /* All user names (for ~user completion as done by shell). */ *************** *** 4487,4493 **** * Done only once and then cached. */ static void ! init_users() { static intlazy_init_done = FALSE; if (lazy_init_done) --- 4488,4495 ---- * Done only once and then cached. */ static void ! init_users() ! { static intlazy_init_done = FALSE; if (lazy_init_done) *** ../vim-7.3.1213/src/regexp_nfa.c2013-06-16 15:43:43.000000000 +0200 --- src/regexp_nfa.c2013-06-16 22:46:35.000000000 +0200 *************** *** 273,278 **** --- 273,279 ---- static int nfa_get_reganch __ARGS((nfa_state_T *start, int depth)); static int nfa_get_regstart __ARGS((nfa_state_T *start, int depth)); static char_u *nfa_get_match_text __ARGS((nfa_state_T *start)); + static int realloc_post_list __ARGS((void)); static int nfa_recognize_char_class __ARGS((char_u *start, char_u *end, int extra_newl)); static int nfa_emit_equi_class __ARGS((int c)); static int nfa_regatom __ARGS((void)); *** ../vim-7.3.1213/src/version.c2013-06-16 17:32:33.000000000 +0200 --- src/version.c2013-06-16 22:45:31.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1214, /**/ </pre> Bram Moolenaar 2013-06-16T20:49:29 http://comments.gmane.org/gmane.editors.vim.devel/40675 <pre> Patch 7.3.1213 Problem: Can't build with small features and Python. Solution: Adjust #ifdefs. Files: src/eval.c, src/buffer.c, src/eval.c, src/window.c *** ../vim-7.3.1212/src/eval.c2013-06-16 14:18:20.000000000 +0200 --- src/eval.c2013-06-16 17:24:32.000000000 +0200 *************** *** 112,118 **** --- 112,120 ---- static char *e_letwrong = N_("E734: Wrong variable type for %s="); static char *e_nofunc = N_("E130: Unknown function: %s"); static char *e_illvar = N_("E461: Illegal variable name: %s"); + #ifdef FEAT_FLOAT static char *e_float_as_string = N_("E806: using Float as a String"); + #endif static dictitem_Tglobvars_var;/* variable used for g: */ #define globvarht globvardict.dv_hashtab *************** *** 11882,11888 **** static win_T * find_win_by_nr(vp, tp) typval_T*vp; ! tabpage_T*tp; /* NULL for current tab page */ { #ifdef FEAT_WINDOWS win_T*wp; --- 11884,11890 ---- static win_T * find_win_by_nr(vp, tp) typval_T*vp; ! tabpage_T*tp UNUSED;/* NULL for current tab page */ { #ifdef FEAT_WINDOWS win_T*wp; *************** *** 11932,11938 **** win_T*win, *oldcurwin; char_u*varname; dictitem_T*v; ! tabpage_T*tp, *oldtabpage; intdone = FALSE; #ifdef FEAT_WINDOWS --- 11934,11941 ---- win_T*win, *oldcurwin; char_u*varname; dictitem_T*v; ! tabpage_T*tp = NULL; ! tabpage_T*oldtabpage; intdone = FALSE; #ifdef FEAT_WINDOWS *************** *** 16683,16706 **** typval_T*argvars; typval_T*rettv; { tabpage_T*save_curtab; char_u*varname, *tabvarname; typval_T*varp; - tabpage_T*tp; rettv-&gt;vval.v_number = 0; if (check_restricted() || check_secure()) return; tp = find_tabpage((int)get_tv_number_chk(&amp;argvars[0], NULL)); varname = get_tv_string_chk(&amp;argvars[1]); varp = &amp;argvars[2]; ! if (tp != NULL &amp;&amp; varname != NULL &amp;&amp; varp != NULL) { save_curtab = curtab; goto_tabpage_tp(tp, FALSE, FALSE); tabvarname = alloc((unsigned)STRLEN(varname) + 3); if (tabvarname != NULL) --- 16686,16719 ---- typval_T*argvars; typval_T*rettv; { + #ifdef FEAT_WINDOWS tabpage_T*save_curtab; + tabpage_T*tp; + #endif char_u*varname, *tabvarname; typval_T*varp; rettv-&gt;vval.v_number = 0; if (check_restricted() || check_secure()) return; + #ifdef FEAT_WINDOWS tp = find_tabpage((int)get_tv_number_chk(&amp;argvars[0], NULL)); + #endif varname = get_tv_string_chk(&amp;argvars[1]); varp = &amp;argvars[2]; ! if (varname != NULL &amp;&amp; varp != NULL ! #ifdef FEAT_WINDOWS ! &amp;&amp; tp != NULL ! #endif ! ) { + #ifdef FEAT_WINDOWS save_curtab = curtab; goto_tabpage_tp(tp, FALSE, FALSE); + #endif tabvarname = alloc((unsigned)STRLEN(varname) + 3); if (tabvarname != NULL) *************** *** 16711,16719 **** --- 16724,16734 ---- vim_free(tabvarname); } + #ifdef FEAT_WINDOWS /* Restore current tabpage */ if (valid_tabpage(save_curtab)) goto_tabpage_tp(save_curtab, FALSE, FALSE); + #endif } } *************** *** 16757,16763 **** char_u*varname, *winvarname; typval_T*varp; char_unbuf[NUMBUFLEN]; ! tabpage_T*tp; if (check_restricted() || check_secure()) return; --- 16772,16778 ---- char_u*varname, *winvarname; typval_T*varp; char_unbuf[NUMBUFLEN]; ! tabpage_T*tp = NULL; if (check_restricted() || check_secure()) return; *** ../vim-7.3.1212/src/buffer.c2013-06-08 18:19:39.000000000 +0200 --- src/buffer.c2013-06-16 17:14:14.000000000 +0200 *************** *** 984,989 **** --- 984,993 ---- return errormsg; } + #endif /* FEAT_LISTCMDS */ + + #if defined(FEAT_LISTCMDS) || defined(FEAT_PYTHON) \ + || defined(FEAT_PYTHON3) || defined(PROTO) /* * Implementation of the commands for the buffer list. *************** *** 1364,1371 **** return OK; } ! ! #endif /* FEAT_LISTCMDS */ /* * Set current buffer to "buf". Executes autocommands and closes current --- 1368,1374 ---- return OK; } ! #endif /* * Set current buffer to "buf". Executes autocommands and closes current *** ../vim-7.3.1212/src/eval.c2013-06-16 14:18:20.000000000 +0200 --- src/eval.c2013-06-16 17:24:32.000000000 +0200 *************** *** 112,118 **** --- 112,120 ---- static char *e_letwrong = N_("E734: Wrong variable type for %s="); static char *e_nofunc = N_("E130: Unknown function: %s"); static char *e_illvar = N_("E461: Illegal variable name: %s"); + #ifdef FEAT_FLOAT static char *e_float_as_string = N_("E806: using Float as a String"); + #endif static dictitem_Tglobvars_var;/* variable used for g: */ #define globvarht globvardict.dv_hashtab *************** *** 11882,11888 **** static win_T * find_win_by_nr(vp, tp) typval_T*vp; ! tabpage_T*tp; /* NULL for current tab page */ { #ifdef FEAT_WINDOWS win_T*wp; --- 11884,11890 ---- static win_T * find_win_by_nr(vp, tp) typval_T*vp; ! tabpage_T*tp UNUSED;/* NULL for current tab page */ { #ifdef FEAT_WINDOWS win_T*wp; *************** *** 11932,11938 **** win_T*win, *oldcurwin; char_u*varname; dictitem_T*v; ! tabpage_T*tp, *oldtabpage; intdone = FALSE; #ifdef FEAT_WINDOWS --- 11934,11941 ---- win_T*win, *oldcurwin; char_u*varname; dictitem_T*v; ! tabpage_T*tp = NULL; ! tabpage_T*oldtabpage; intdone = FALSE; #ifdef FEAT_WINDOWS *************** *** 16683,16706 **** typval_T*argvars; typval_T*rettv; { tabpage_T*save_curtab; char_u*varname, *tabvarname; typval_T*varp; - tabpage_T*tp; rettv-&gt;vval.v_number = 0; if (check_restricted() || check_secure()) return; tp = find_tabpage((int)get_tv_number_chk(&amp;argvars[0], NULL)); varname = get_tv_string_chk(&amp;argvars[1]); varp = &amp;argvars[2]; ! if (tp != NULL &amp;&amp; varname != NULL &amp;&amp; varp != NULL) { save_curtab = curtab; goto_tabpage_tp(tp, FALSE, FALSE); tabvarname = alloc((unsigned)STRLEN(varname) + 3); if (tabvarname != NULL) --- 16686,16719 ---- typval_T*argvars; typval_T*rettv; { + #ifdef FEAT_WINDOWS tabpage_T*save_curtab; + tabpage_T*tp; + #endif char_u*varname, *tabvarname; typval_T*varp; rettv-&gt;vval.v_number = 0; if (check_restricted() || check_secure()) return; + #ifdef FEAT_WINDOWS tp = find_tabpage((int)get_tv_number_chk(&amp;argvars[0], NULL)); + #endif varname = get_tv_string_chk(&amp;argvars[1]); varp = &amp;argvars[2]; ! if (varname != NULL &amp;&amp; varp != NULL ! #ifdef FEAT_WINDOWS ! &amp;&amp; tp != NULL ! #endif ! ) { + #ifdef FEAT_WINDOWS save_curtab = curtab; goto_tabpage_tp(tp, FALSE, FALSE); + #endif tabvarname = alloc((unsigned)STRLEN(varname) + 3); if (tabvarname != NULL) *************** *** 16711,16719 **** --- 16724,16734 ---- vim_free(tabvarname); } + #ifdef FEAT_WINDOWS /* Restore current tabpage */ if (valid_tabpage(save_curtab)) goto_tabpage_tp(save_curtab, FALSE, FALSE); + #endif } } *************** *** 16757,16763 **** char_u*varname, *winvarname; typval_T*varp; char_unbuf[NUMBUFLEN]; ! tabpage_T*tp; if (check_restricted() || check_secure()) return; --- 16772,16778 ---- char_u*varname, *winvarname; typval_T*varp; char_unbuf[NUMBUFLEN]; ! tabpage_T*tp = NULL; if (check_restricted() || check_secure()) return; *** ../vim-7.3.1212/src/window.c2013-06-16 14:18:20.000000000 +0200 --- src/window.c2013-06-16 17:25:11.000000000 +0200 *************** *** 6582,6592 **** */ int switch_win(save_curwin, save_curtab, win, tp, no_display) ! win_T**save_curwin; ! tabpage_T**save_curtab; ! win_T*win; ! tabpage_T*tp; ! intno_display; { # ifdef FEAT_AUTOCMD block_autocmds(); --- 6582,6592 ---- */ int switch_win(save_curwin, save_curtab, win, tp, no_display) ! win_T**save_curwin UNUSED; ! tabpage_T**save_curtab UNUSED; ! win_T*win UNUSED; ! tabpage_T*tp UNUSED; ! intno_display UNUSED; { # ifdef FEAT_AUTOCMD block_autocmds(); *************** *** 6627,6635 **** */ void restore_win(save_curwin, save_curtab, no_display) ! win_T*save_curwin; ! tabpage_T*save_curtab; ! intno_display; { # ifdef FEAT_WINDOWS if (save_curtab != NULL &amp;&amp; valid_tabpage(save_curtab)) --- 6627,6635 ---- */ void restore_win(save_curwin, save_curtab, no_display) ! win_T*save_curwin UNUSED; ! tabpage_T*save_curtab UNUSED; ! intno_display UNUSED; { # ifdef FEAT_WINDOWS if (save_curtab != NULL &amp;&amp; valid_tabpage(save_curtab)) *************** *** 6906,6914 **** } int ! get_tab_number(tabpage_T *tp) { inti = 1; tabpage_T*t; for (t = first_tabpage; t != NULL &amp;&amp; t != tp; t = t-&gt;tp_next) --- 6906,6915 ---- } int ! get_tab_number(tabpage_T *tp UNUSED) { inti = 1; + # ifdef FEAT_WINDOWS tabpage_T*t; for (t = first_tabpage; t != NULL &amp;&amp; t != tp; t = t-&gt;tp_next) *************** *** 6917,6922 **** --- 6918,6924 ---- if (t == NULL) return 0; else + # endif return i; } #endif *** ../vim-7.3.1212/src/version.c2013-06-16 16:57:43.000000000 +0200 --- src/version.c2013-06-16 17:30:40.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1213, /**/ </pre> Bram Moolenaar 2013-06-16T15:32:54 http://comments.gmane.org/gmane.editors.vim.devel/40665 <pre></pre> ZyX 2013-06-16T15:21:48 http://comments.gmane.org/gmane.editors.vim.devel/40663 <pre> Patch 7.3.1212 Problem: "make test" on MS-Windows does not report failure like Unix does. Solution: Make it work like on Unix. (Taro Muraoka) Files: src/testdir/Make_dos.mak *** ../vim-7.3.1211/src/testdir/Make_dos.mak2013-06-09 17:52:42.000000000 +0200 --- src/testdir/Make_dos.mak2013-06-16 16:52:22.000000000 +0200 *************** *** 40,62 **** .SUFFIXES: .in .out ! nongui:fixff $(SCRIPTS16) $(SCRIPTS) ! echo ALL DONE ! small: ! echo ALL DONE ! gui:fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) ! echo ALL DONE ! win32:fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) ! echo ALL DONE fixff: -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \ dotest.in test60.ok test71.ok test74.ok clean: -del *.out -if exist test.ok del test.ok --- 40,64 ---- .SUFFIXES: .in .out ! nongui:fixff $(SCRIPTS16) $(SCRIPTS) report ! small:report ! gui:fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) report ! win32:fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) report fixff: -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \ dotest.in test60.ok test71.ok test74.ok + report: + &lt; at &gt;echo "" + &lt; at &gt;echo Test results: + &lt; at &gt;IF EXIST test.log ( type test.log &amp; echo TEST FAILURE &amp; exit /b 1 ) \ + ELSE ( ECHO ALL DONE ) + clean: -del *.out -if exist test.ok del test.ok *************** *** 67,81 **** -if exist lua.vim del lua.vim -del X* -if exist viminfo del viminfo .in.out: copy $*.ok test.ok $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in ! diff test.out $*.ok ! -if exist $*.out del $*.out ! rename test.out $*.out -del X* -del X*.* -del test.ok -rd /s /q Xfind -if exist viminfo del viminfo --- 69,86 ---- -if exist lua.vim del lua.vim -del X* -if exist viminfo del viminfo + -del test.log .in.out: copy $*.ok test.ok $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in ! &lt; at &gt;diff test.out $*.ok &amp; if errorlevel 1 (echo $* FAILED &gt;&gt; test.log ) \ ! else ( del /F $*.out &amp; rename test.out $*.out ) -del X* -del X*.* -del test.ok -rd /s /q Xfind -if exist viminfo del viminfo + + nolog: + -del test.log *** ../vim-7.3.1211/src/version.c2013-06-16 16:41:42.000000000 +0200 --- src/version.c2013-06-16 16:54:02.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1212, /**/ </pre> Bram Moolenaar 2013-06-16T14:58:07 http://comments.gmane.org/gmane.editors.vim.devel/40660 <pre> Patch 7.3.1211 Problem: MS-Windows: When 'encoding' differs from the current codepage ":hardcopy" does not work properly. Solution: Use TextOutW() and SetDlgItemTextW(). (Ken Takata) Files: src/os_mswin.c, src/vim.rc *** ../vim-7.3.1210/src/os_mswin.c2013-06-16 16:01:20.000000000 +0200 --- src/os_mswin.c2013-06-16 16:41:11.000000000 +0200 *************** *** 1045,1050 **** --- 1045,1073 ---- #define IDC_PRINTTEXT2402 #define IDC_PROGRESS403 + #if !defined(FEAT_MBYTE) || defined(WIN16) + # define vimSetDlgItemText(h, i, s) SetDlgItemText(h, i, s) + #else + static BOOL + vimSetDlgItemText(HWND hDlg, int nIDDlgItem, char_u *s) + { + WCHAR *wp = NULL; + BOOL ret; + + if (enc_codepage &gt;= 0 &amp;&amp; (int)GetACP() != enc_codepage) + { + wp = enc_to_utf16(s, NULL); + } + if (wp != NULL) + { + ret = SetDlgItemTextW(hDlg, nIDDlgItem, wp); + vim_free(wp); + return ret; + } + return SetDlgItemText(hDlg, nIDDlgItem, s); + } + #endif + /* * Convert BGR to RGB for Windows GDI calls */ *************** *** 1096,1113 **** { SendDlgItemMessage(hDlg, i, WM_SETFONT, (WPARAM)hfont, 1); if (GetDlgItemText(hDlg,i, buff, sizeof(buff))) ! SetDlgItemText(hDlg,i, _(buff)); } SendDlgItemMessage(hDlg, IDCANCEL, WM_SETFONT, (WPARAM)hfont, 1); if (GetDlgItemText(hDlg,IDCANCEL, buff, sizeof(buff))) ! SetDlgItemText(hDlg,IDCANCEL, _(buff)); } #endif SetWindowText(hDlg, szAppName); if (prt_name != NULL) { ! SetDlgItemText(hDlg, IDC_PRINTTEXT2, (LPSTR)prt_name); vim_free(prt_name); prt_name = NULL; } --- 1119,1136 ---- { SendDlgItemMessage(hDlg, i, WM_SETFONT, (WPARAM)hfont, 1); if (GetDlgItemText(hDlg,i, buff, sizeof(buff))) ! vimSetDlgItemText(hDlg,i, _(buff)); } SendDlgItemMessage(hDlg, IDCANCEL, WM_SETFONT, (WPARAM)hfont, 1); if (GetDlgItemText(hDlg,IDCANCEL, buff, sizeof(buff))) ! vimSetDlgItemText(hDlg,IDCANCEL, _(buff)); } #endif SetWindowText(hDlg, szAppName); if (prt_name != NULL) { ! vimSetDlgItemText(hDlg, IDC_PRINTTEXT2, (LPSTR)prt_name); vim_free(prt_name); prt_name = NULL; } *************** *** 1565,1571 **** SetAbortProc(prt_dlg.hDC, AbortProc); #endif wsprintf(szBuffer, _("Printing '%s'"), gettail(psettings-&gt;jobname)); ! SetDlgItemText(hDlgPrint, IDC_PRINTTEXT1, (LPSTR)szBuffer); vim_memset(&amp;di, 0, sizeof(DOCINFO)); di.cbSize = sizeof(DOCINFO); --- 1588,1594 ---- SetAbortProc(prt_dlg.hDC, AbortProc); #endif wsprintf(szBuffer, _("Printing '%s'"), gettail(psettings-&gt;jobname)); ! vimSetDlgItemText(hDlgPrint, IDC_PRINTTEXT1, (LPSTR)szBuffer); vim_memset(&amp;di, 0, sizeof(DOCINFO)); di.cbSize = sizeof(DOCINFO); *************** *** 1599,1605 **** mch_print_begin_page(char_u *msg) { if (msg != NULL) ! SetDlgItemText(hDlgPrint, IDC_PROGRESS, (LPSTR)msg); return (StartPage(prt_dlg.hDC) &gt; 0); } --- 1622,1628 ---- mch_print_begin_page(char_u *msg) { if (msg != NULL) ! vimSetDlgItemText(hDlgPrint, IDC_PROGRESS, (LPSTR)msg); return (StartPage(prt_dlg.hDC) &gt; 0); } *************** *** 1628,1637 **** int mch_print_text_out(char_u *p, int len) { ! #ifdef FEAT_PROPORTIONAL_FONTS SIZEsz; #endif TextOut(prt_dlg.hDC, prt_pos_x + prt_left_margin, prt_pos_y + prt_top_margin, p, len); #ifndef FEAT_PROPORTIONAL_FONTS --- 1651,1691 ---- int mch_print_text_out(char_u *p, int len) { ! #if defined(FEAT_PROPORTIONAL_FONTS) || (defined(FEAT_MBYTE) &amp;&amp; !defined(WIN16)) SIZEsz; #endif + #if defined(FEAT_MBYTE) &amp;&amp; !defined(WIN16) + WCHAR*wp = NULL; + intwlen = len; + if (enc_codepage &gt;= 0 &amp;&amp; (int)GetACP() != enc_codepage) + { + wp = enc_to_utf16(p, &amp;wlen); + } + if (wp != NULL) + { + int ret = FALSE; + + TextOutW(prt_dlg.hDC, prt_pos_x + prt_left_margin, + prt_pos_y + prt_top_margin, wp, wlen); + GetTextExtentPoint32W(prt_dlg.hDC, wp, wlen, &amp;sz); + vim_free(wp); + prt_pos_x += (sz.cx - prt_tm.tmOverhang); + /* This is wrong when printing spaces for a TAB. */ + if (p[len] != NUL) + { + wlen = MB_PTR2LEN(p + len); + wp = enc_to_utf16(p + len, &amp;wlen); + if (wp != NULL) + { + GetTextExtentPoint32W(prt_dlg.hDC, wp, 1, &amp;sz); + ret = (prt_pos_x + prt_left_margin + sz.cx &gt; prt_right_margin); + vim_free(wp); + } + } + return ret; + } + #endif TextOut(prt_dlg.hDC, prt_pos_x + prt_left_margin, prt_pos_y + prt_top_margin, p, len); #ifndef FEAT_PROPORTIONAL_FONTS *************** *** 1947,1954 **** reply.cbData = (DWORD)STRLEN(res) + 1; serverSendEnc(sender); ! retval = (int)SendMessage(sender, WM_COPYDATA, (WPARAM)message_window, ! (LPARAM)(&amp;reply)); vim_free(res); return retval; --- 2001,2008 ---- reply.cbData = (DWORD)STRLEN(res) + 1; serverSendEnc(sender); ! retval = (int)SendMessage(sender, WM_COPYDATA, ! (WPARAM)message_window, (LPARAM)(&amp;reply)); vim_free(res); return retval; *** ../vim-7.3.1210/src/vim.rc2010-08-15 21:57:30.000000000 +0200 --- src/vim.rc2013-06-16 16:37:33.000000000 +0200 *************** *** 116,123 **** FONT 8, "Helv" BEGIN DEFPUSHBUTTON "Cancel", IDCANCEL, 85, 60, 40, 14 ! CTEXT "Printing",IDC_PRINTTEXT1,23,15,157,8 ! CTEXT " ",IDC_PRINTTEXT2,23,25,157,8 ! CTEXT "Initializing...",IDC_PROGRESS,24,38,157,8 GROUPBOX "",IDC_BOX1,19,9,170,47 END --- 116,123 ---- FONT 8, "Helv" BEGIN DEFPUSHBUTTON "Cancel", IDCANCEL, 85, 60, 40, 14 ! CTEXT "Printing",IDC_PRINTTEXT1,23,15,157,9 ! CTEXT " ",IDC_PRINTTEXT2,23,25,157,9 ! CTEXT "Initializing...",IDC_PROGRESS,24,38,157,9 GROUPBOX "",IDC_BOX1,19,9,170,47 END *** ../vim-7.3.1210/src/version.c2013-06-16 16:34:53.000000000 +0200 --- src/version.c2013-06-16 16:39:19.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1211, /**/ </pre> Bram Moolenaar 2013-06-16T14:42:23 http://comments.gmane.org/gmane.editors.vim.devel/40658 <pre> Patch 7.3.1210 (after 7.3.1182) Problem: 'backupcopy' default on MS-Windows is wrong when 'encoding' equals the current codepage. Solution: Change the #else block. (Ken Takata) Files: src/os_win32.c *** ../vim-7.3.1209/src/os_win32.c2013-06-12 22:41:30.000000000 +0200 --- src/os_win32.c2013-06-16 16:29:34.000000000 +0200 *************** *** 2789,2802 **** reparseTag = findDataW.dwReserved0; } } ! #else ! hFind = FindFirstFile(fname, &amp;findDataA); ! if (hFind != INVALID_HANDLE_VALUE) { ! fileFlags = findDataA.dwFileAttributes; ! reparseTag = findDataA.dwReserved0; } - #endif if (hFind != INVALID_HANDLE_VALUE) FindClose(hFind); --- 2789,2804 ---- reparseTag = findDataW.dwReserved0; } } ! else ! #endif { ! hFind = FindFirstFile(fname, &amp;findDataA); ! if (hFind != INVALID_HANDLE_VALUE) ! { ! fileFlags = findDataA.dwFileAttributes; ! reparseTag = findDataA.dwReserved0; ! } } if (hFind != INVALID_HANDLE_VALUE) FindClose(hFind); *** ../vim-7.3.1209/src/version.c2013-06-16 16:13:59.000000000 +0200 --- src/version.c2013-06-16 16:31:14.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1210, /**/ </pre> Bram Moolenaar 2013-06-16T14:35:12 http://comments.gmane.org/gmane.editors.vim.devel/40655 <pre> Patch 7.3.1209 Problem: No completion for ":tabdo". Solution: Add tabdo to the list of modifiers. (Dominique Pelle) Files: src/ex_docmd.c *** ../vim-7.3.1208/src/ex_docmd.c2013-06-14 19:15:52.000000000 +0200 --- src/ex_docmd.c2013-06-16 16:11:32.000000000 +0200 *************** *** 3603,3608 **** --- 3603,3609 ---- case CMD_sandbox: case CMD_silent: case CMD_tab: + case CMD_tabdo: case CMD_topleft: case CMD_verbose: case CMD_vertical: *** ../vim-7.3.1208/src/version.c2013-06-16 16:01:20.000000000 +0200 --- src/version.c2013-06-16 16:12:14.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1209, /**/ </pre> Bram Moolenaar 2013-06-16T14:14:18 http://comments.gmane.org/gmane.editors.vim.devel/40652 <pre> Patch 7.3.1208 Problem: Compiler warnings on MS-Windows. Solution: Add type cast. Move variable declaration. (Mike Williams) Files: src/option.c, src/os_mswin.c *** ../vim-7.3.1207/src/option.c2013-06-08 18:19:40.000000000 +0200 --- src/option.c2013-06-16 15:59:00.000000000 +0200 *************** *** 3181,3187 **** if (opt_idx &gt;= 0) { #if !defined(HAVE_AVAIL_MEM) &amp;&amp; !defined(HAVE_TOTAL_MEM) ! if ((long)options[opt_idx].def_val[VI_DEFAULT] &gt; n || (long)options[opt_idx].def_val[VI_DEFAULT] == 0L) #endif options[opt_idx].def_val[VI_DEFAULT] = (char_u *)n; --- 3181,3187 ---- if (opt_idx &gt;= 0) { #if !defined(HAVE_AVAIL_MEM) &amp;&amp; !defined(HAVE_TOTAL_MEM) ! if ((long)options[opt_idx].def_val[VI_DEFAULT] &gt; (long)n || (long)options[opt_idx].def_val[VI_DEFAULT] == 0L) #endif options[opt_idx].def_val[VI_DEFAULT] = (char_u *)n; *** ../vim-7.3.1207/src/os_mswin.c2013-05-06 04:21:35.000000000 +0200 --- src/os_mswin.c2013-06-16 15:59:41.000000000 +0200 *************** *** 1897,1903 **** HWNDsender = (HWND)wParam; COPYDATASTRUCTreply; char_u*res; - char_uwinstr[30]; intretval; char_u*str; char_u*tofree; --- 1897,1902 ---- *************** *** 1970,1975 **** --- 1969,1976 ---- #ifdef FEAT_AUTOCMD else if (data-&gt;dwData == COPYDATA_REPLY) { + char_uwinstr[30]; + sprintf((char *)winstr, PRINTF_HEX_LONG_U, (long_u)sender); apply_autocmds(EVENT_REMOTEREPLY, winstr, str, TRUE, curbuf); *** ../vim-7.3.1207/src/version.c2013-06-16 15:43:43.000000000 +0200 --- src/version.c2013-06-16 15:57:31.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1208, /**/ </pre> Bram Moolenaar 2013-06-16T14:01:40 http://comments.gmane.org/gmane.editors.vim.devel/40651 <pre>Hi Completion is allowed after :bufdo, :windo and :argdo, but there is no completion after :tabdo $ vim -u NONE :tabdo &lt;CTRL-d&gt; --&gt; no completion Attached patch fixes it. Patch was already posted earlier in vim_use. See: http://comments.gmane.org/gmane.editors.vim/112305 but I did not any reply, so I suppose that it was forgotten and should have been sent to vim_dev. Regards Dominique </pre> Dominique Pellé 2013-06-16T13:58:18 http://comments.gmane.org/gmane.editors.vim.devel/40649 <pre> Patch 7.3.1207 Problem: New regexp engine: no match found on "#if FOO". (Lech Lorens) Solution: When adding a state gets skipped don't adjust the index. Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok *** ../vim-7.3.1206/src/regexp_nfa.c2013-06-14 22:33:47.000000000 +0200 --- src/regexp_nfa.c2013-06-16 15:38:15.000000000 +0200 *************** *** 4210,4215 **** --- 4210,4217 ---- /* re-order to put the new state at the current position */ count = l-&gt;n - tlen; + if (count == 0) + return; /* no state got added */ if (count == 1) { /* overwrite the current state */ *** ../vim-7.3.1206/src/testdir/test64.in2013-06-15 15:09:44.000000000 +0200 --- src/testdir/test64.in2013-06-16 15:38:04.000000000 +0200 *************** *** 408,413 **** --- 408,415 ---- :"""" Requiring lots of states. :call add(tl, [2, '[0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12}', " 12345678-1234-1234-1234-123456789012 ", "12345678-1234-1234-1234-123456789012", "1234-"]) :" + :"""" Skip adding state twice + :call add(tl, [2, '^\%(\%(^\s*#\s*if\&gt;\|#\s*if\)\)\(\%&gt;1c.*$\)\&lt; at &gt;=', "#if FOO", "#if", ' FOO']) :" :"""" Run the tests :" *** ../vim-7.3.1206/src/testdir/test64.ok2013-06-15 15:09:44.000000000 +0200 --- src/testdir/test64.ok2013-06-16 15:38:22.000000000 +0200 *************** *** 913,918 **** --- 913,921 ---- OK 0 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12} OK 1 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12} OK 2 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12} + OK 0 - ^\%(\%(^\s*#\s*if\&gt;\|#\s*if\)\)\(\%&gt;1c.*$\)\&lt; at &gt;= + OK 1 - ^\%(\%(^\s*#\s*if\&gt;\|#\s*if\)\)\(\%&gt;1c.*$\)\&lt; at &gt;= + OK 2 - ^\%(\%(^\s*#\s*if\&gt;\|#\s*if\)\)\(\%&gt;1c.*$\)\&lt; at &gt;= multi-line tests OK 0 - ^.\(.\).\_..\1. OK 1 - ^.\(.\).\_..\1. *** ../vim-7.3.1206/src/version.c2013-06-16 14:25:53.000000000 +0200 --- src/version.c2013-06-16 15:42:05.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1207, /**/ </pre> Bram Moolenaar 2013-06-16T13:44:05 http://comments.gmane.org/gmane.editors.vim.devel/40646 <pre> Patch 7.3.1206 Problem: Inconsistent function argument declarations. Solution: Use ANSI style. Files: src/if_py_both.h *** ../vim-7.3.1205/src/if_py_both.h2013-06-16 14:18:20.000000000 +0200 --- src/if_py_both.h2013-06-16 14:24:51.000000000 +0200 *************** *** 1278,1284 **** } static dict_T * ! py_dict_alloc() { dict_T*r; --- 1278,1284 ---- } static dict_T * ! py_dict_alloc(void) { dict_T*r; *************** *** 1545,1551 **** } static PyInt ! DictionaryAssItem(DictionaryObject *self, PyObject *keyObject, PyObject *valObject) { char_u*key; typval_Ttv; --- 1545,1552 ---- } static PyInt ! DictionaryAssItem( ! DictionaryObject *self, PyObject *keyObject, PyObject *valObject) { char_u*key; typval_Ttv; *************** *** 2669,2679 **** } static int ! set_option_value_err(key, numval, stringval, opt_flags) ! char_u*key; ! intnumval; ! char_u*stringval; ! intopt_flags; { char_u*errmsg; --- 2670,2676 ---- } static int ! set_option_value_err(char_u *key, int numval, char_u *stringval, int opt_flags) { char_u*errmsg; *************** *** 2688,2700 **** } static int ! set_option_value_for(key, numval, stringval, opt_flags, opt_type, from) ! char_u*key; ! intnumval; ! char_u*stringval; ! intopt_flags; ! intopt_type; ! void*from; { win_T*save_curwin = NULL; tabpage_T*save_curtab = NULL; --- 2685,2697 ---- } static int ! set_option_value_for( ! char_u *key, ! int numval, ! char_u *stringval, ! int opt_flags, ! int opt_type, ! void *from) { win_T*save_curwin = NULL; tabpage_T*save_curtab = NULL; *************** *** 5619,5625 **** } static int ! init_sys_path() { PyObject*path; PyObject*path_hook; --- 5616,5622 ---- } static int ! init_sys_path(void) { PyObject*path; PyObject*path_hook; *** ../vim-7.3.1205/src/version.c2013-06-16 14:20:10.000000000 +0200 --- src/version.c2013-06-16 14:25:11.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1206, /**/ </pre> Bram Moolenaar 2013-06-16T12:26:18 http://comments.gmane.org/gmane.editors.vim.devel/40645 <pre> Patch 7.3.1205 Problem: logtalk.dict is not removed on uninstall. Solution: Remove the file. (Kazunobu Kuriyama) Files: src/Makefile *** ../vim-7.3.1204/src/Makefile2013-05-21 13:30:17.000000000 +0200 --- src/Makefile2013-06-16 14:13:15.000000000 +0200 *************** *** 2311,2317 **** -rm -rf $(DEST_COMP) -rm -f $(DEST_PRINT)/*.ps -rmdir $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND) ! -rm -rf $(DEST_FTP)/*.vim $(DEST_FTP)/README.txt -rm -f $(DEST_AUTO)/*.vim $(DEST_AUTO)/README.txt $(DEST_AUTO)/xml/*.vim -rm -f $(DEST_PLUG)/*.vim $(DEST_PLUG)/README.txt -rmdir $(DEST_FTP) $(DEST_AUTO)/xml $(DEST_AUTO) $(DEST_PLUG) $(DEST_RT) --- 2311,2317 ---- -rm -rf $(DEST_COMP) -rm -f $(DEST_PRINT)/*.ps -rmdir $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND) ! -rm -rf $(DEST_FTP)/*.vim $(DEST_FTP)/README.txt $(DEST_FTP)/logtalk.dict -rm -f $(DEST_AUTO)/*.vim $(DEST_AUTO)/README.txt $(DEST_AUTO)/xml/*.vim -rm -f $(DEST_PLUG)/*.vim $(DEST_PLUG)/README.txt -rmdir $(DEST_FTP) $(DEST_AUTO)/xml $(DEST_AUTO) $(DEST_PLUG) $(DEST_RT) *** ../vim-7.3.1204/src/version.c2013-06-16 14:18:20.000000000 +0200 --- src/version.c2013-06-16 14:19:23.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 1205, /**/ </pre> Bram Moolenaar 2013-06-16T12:20:28 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.editors.vim.devel