diff options
| -rw-r--r-- | runtime/compiler/checkstyle.vim | 7 | ||||
| -rw-r--r-- | runtime/compiler/javac.vim | 7 | ||||
| -rw-r--r-- | runtime/compiler/php.vim | 18 | ||||
| -rw-r--r-- | runtime/compiler/se.vim | 14 | ||||
| -rw-r--r-- | runtime/compiler/tcl.vim | 3 | ||||
| -rw-r--r-- | runtime/compiler/tidy.vim | 16 | ||||
| -rw-r--r-- | runtime/compiler/xmllint.vim | 4 | ||||
| -rw-r--r-- | runtime/doc/diff.txt | 8 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/version7.txt | 94 | ||||
| -rw-r--r-- | runtime/plugin/tohtml.vim | 10 | ||||
| -rw-r--r-- | runtime/syntax/2html.vim | 4 | ||||
| -rw-r--r-- | runtime/syntax/help.vim | 9 | ||||
| -rw-r--r-- | src/po/nl.po | 4149 | ||||
| -rw-r--r-- | src/po/pl.UTF-8.po | 700 | ||||
| -rw-r--r-- | src/po/pl.cp1250.po | 700 | ||||
| -rw-r--r-- | src/po/pl.po | 698 | ||||
| -rw-r--r-- | src/po/ru.cp1251.po | 483 | ||||
| -rw-r--r-- | src/po/ru.po | 483 |
20 files changed, 3299 insertions, 4116 deletions
diff --git a/runtime/compiler/checkstyle.vim b/runtime/compiler/checkstyle.vim index 74ab3e4210..eac461bb2d 100644 --- a/runtime/compiler/checkstyle.vim +++ b/runtime/compiler/checkstyle.vim @@ -1,8 +1,7 @@ " Vim compiler file " Compiler: Checkstyle -" Maintainer: Doug Kearns <djkea2@gus.gscit.monash.edu.au> -" URL: http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/checkstyle.vim -" Last Change: 2004 Nov 27 +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2013 Jun 26 if exists("current_compiler") finish @@ -17,4 +16,4 @@ CompilerSet makeprg=java\ com.puppycrawl.tools.checkstyle.Main\ -f\ plain " sample error: WebTable.java:282: '+=' is not preceeded with whitespace. " WebTable.java:201:1: '{' should be on the previous line. -CompilerSet errorformat=%f:%l:\ %m,%f:%l:%v:\ %m,%-G%.%# +CompilerSet errorformat=%f:%l:%v:\ %m,%f:%l:\ %m,%-G%.%# diff --git a/runtime/compiler/javac.vim b/runtime/compiler/javac.vim index 234e28b620..a50bdca8f2 100644 --- a/runtime/compiler/javac.vim +++ b/runtime/compiler/javac.vim @@ -1,8 +1,7 @@ " Vim compiler file -" Compiler: javac -" Maintainer: Doug Kearns <djkea2@gus.gscit.monash.edu.au> -" URL: http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/javac.vim -" Last Change: 2004 Nov 27 +" Compiler: javac +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2004 Nov 27 if exists("current_compiler") finish diff --git a/runtime/compiler/php.vim b/runtime/compiler/php.vim index 2f4f032b9b..92f93b89fc 100644 --- a/runtime/compiler/php.vim +++ b/runtime/compiler/php.vim @@ -1,8 +1,7 @@ " Vim compiler file -" Compiler: PHP -" Maintainer: Doug Kearns <djkea2@gus.gscit.monash.edu.au> -" URL: http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/php.vim -" Last Change: 2004 Nov 27 +" Compiler: PHP CLI +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2013 Jun 25 if exists("current_compiler") finish @@ -17,12 +16,11 @@ let s:cpo_save = &cpo set cpo-=C CompilerSet makeprg=php\ -lq - -CompilerSet errorformat=%E<b>Parse\ error</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />, - \%W<b>Notice</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />, - \%EParse\ error:\ %m\ in\ %f\ on\ line\ %l, - \%WNotice:\ %m\ in\ %f</b>\ on\ line\ %l, - \%-G%.%# +CompilerSet errorformat=%E<b>%.%#Parse\ error</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />, + \%W<b>%.%#Notice</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />, + \%E%.%#Parse\ error:\ %m\ in\ %f\ on\ line\ %l, + \%W%.%#Notice:\ %m\ in\ %f\ on\ line\ %l, + \%-G%.%# let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/compiler/se.vim b/runtime/compiler/se.vim index fbfa62da6a..38fd10c131 100644 --- a/runtime/compiler/se.vim +++ b/runtime/compiler/se.vim @@ -1,8 +1,7 @@ " Vim compiler file -" Compiler: se (SmartEiffel Compiler) -" Maintainer: Doug Kearns <djkea2@gus.gscit.monash.edu.au> -" URL: http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/se.vim -" Last Change: 2004 Nov 27 +" Compiler: se (Liberty Eiffel Compiler) +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2013 Jun 29 if exists("current_compiler") finish @@ -16,12 +15,15 @@ endif let s:cpo_save = &cpo set cpo-=C -CompilerSet makeprg=compile\ % +CompilerSet makeprg=se\ c CompilerSet errorformat=%W******\ Warning:\ %m, \%E******\ Fatal\ Error:\ %m, \%E******\ Error:\ %m, - \%CLine\ %l\ column\ %c\ in\ %\\w%\\+\ (%f)\ :, + \%ZLine\ %l\ column\ %c\ in\ %.%#\ (%f)\ %\\=:, + \%ZLine\ %l\ columns\ %c\\,\ %\\d%\\+\ %.%#\ (%f)\ %\\=:, + \%+C%*[^\ ]%.%#, + \%-GThe\ source\ lines\ involved, \%-G%.%# let &cpo = s:cpo_save diff --git a/runtime/compiler/tcl.vim b/runtime/compiler/tcl.vim index 8bd6de6888..81af185f5e 100644 --- a/runtime/compiler/tcl.vim +++ b/runtime/compiler/tcl.vim @@ -1,7 +1,6 @@ " Vim compiler file " Compiler: tcl -" Maintainer: Doug Kearns <djkea2@gus.gscit.monash.edu.au> -" URL: http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/tcl.vim +" Maintainer: Doug Kearns <dougkearns@gmail.com> " Last Change: 2004 Nov 27 if exists("current_compiler") diff --git a/runtime/compiler/tidy.vim b/runtime/compiler/tidy.vim index 52bc526251..56baee2224 100644 --- a/runtime/compiler/tidy.vim +++ b/runtime/compiler/tidy.vim @@ -1,11 +1,7 @@ " Vim compiler file " Compiler: HTML Tidy -" Maintainer: Doug Kearns <djkea2@gus.gscit.monash.edu.au> -" URL: http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/tidy.vim -" Last Change: 2004 Nov 27 - -" NOTE: set 'tidy_compiler_040800' if you are using the 4th August 2000 release -" of HTML Tidy. +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2013 Jul 7 if exists("current_compiler") finish @@ -16,13 +12,7 @@ if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> endif -" this is needed to work around a bug in the 04/08/00 release of tidy which -" failed to set the filename if the -quiet option was used -if exists("tidy_compiler_040800") - CompilerSet makeprg=tidy\ -errors\ --gnu-emacs\ yes\ % -else - CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ % -endif +CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ % " sample warning: foo.html:8:1: Warning: inserting missing 'foobar' element " sample error: foo.html:9:2: Error: <foobar> is not recognized! diff --git a/runtime/compiler/xmllint.vim b/runtime/compiler/xmllint.vim index ddd4960485..96cfa55383 100644 --- a/runtime/compiler/xmllint.vim +++ b/runtime/compiler/xmllint.vim @@ -1,7 +1,7 @@ " Vim compiler file " Compiler: xmllint " Maintainer: Doug Kearns <dougkearns@gmail.com> -" Last Change: 2013 Jun 1 +" Last Change: 2013 Jul 8 if exists("current_compiler") finish @@ -15,7 +15,7 @@ endif let s:cpo_save = &cpo set cpo-=C -CompilerSet makeprg=xmllint\ --valid\ --noout\ +CompilerSet makeprg=xmllint\ --valid\ --noout CompilerSet errorformat=%+E%f:%l:\ %.%#\ error\ :\ %m, \%+W%f:%l:\ %.%#\ warning\ :\ %m, diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index ba98b42ef0..637c34777d 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.4a. Last change: 2012 Sep 05 +*diff.txt* For Vim version 7.4a. Last change: 2013 Jul 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -128,9 +128,9 @@ file for a moment and come back to the same file and be in diff mode again. :diffo[ff]! Switch off diff mode for the current window and in all windows in the current tab page where 'diff' is set. -The ":diffoff" command resets the relevant options to their default value. -This may be different from what the values were before diff mode was started, -the old values are not remembered. +The ":diffoff" command resets the relevant options to the values they had when +using |:diffsplit|, |:diffpatch| , |:diffthis|. or starting Vim in diff mode. +Otherwise they are set to their default value: 'diff' off 'scrollbind' off diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 72eaeefe46..cf2299b92e 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4a. Last change: 2013 Jun 29 +*options.txt* For Vim version 7.4a. Last change: 2013 Jul 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4646,7 +4646,7 @@ A jump table for the options with a short description can be found at |Q_op|. The cursor is displayed at the start of the space a Tab character occupies, not at the end as usual in Normal mode. To get this cursor position while displaying Tabs with spaces, use: > - :set list lcs=tab\ \ + :set list lcs=tab:\ \ < Note that list mode will also affect formatting (set with 'textwidth' or 'wrapmargin') when 'cpoptions' includes 'L'. See 'listchars' for diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 035922e8e6..b1e812876b 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4a. Last change: 2013 Jul 06 +*todo.txt* For Vim version 7.4a. Last change: 2013 Jul 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -36,6 +36,8 @@ not be repeated below, unless there is extra information. Python: ":py raw_input('prompt')" doesn't work. (Manu Hack) +Patch to add "acl" and "xpm" as a feature. (Ken Takata, 2013 Jul 8) + Patch to make has() check for Vim version and patch at the same time. (Marc Weber, 2013 Jun 7) diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index a64f277a09..ab2482c176 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.4a. Last change: 2013 Jul 06 +*version7.txt* For Vim version 7.4a. Last change: 2013 Jul 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5994,7 +5994,7 @@ Solution: Init variables. Files: src/ex_cmds2.c, src/ex_docmd.c Patch 7.1.201 -Problem: When reading stdin 'fenc' and 'ff are not set. +Problem: When reading stdin 'fenc' and 'ff' are not set. Solution: Set the options after reading stdin. (Ben Schmidt) Files: src/fileio.c @@ -8787,7 +8787,7 @@ Solution: Change to the new UNUSED style. Files: src/getchar.c Patch 7.2.231 -Problem: Warning for unreacheable code. +Problem: Warning for unreachable code. Solution: Add #ifdef. Files: src/if_perl.xs @@ -10337,7 +10337,7 @@ Files: src/ex_cmds.c Patch 7.3.025 Problem: ":mksession" does not square brackets escape file name properly. -Solution: Improve escapging of file names. (partly by Peter Odding) +Solution: Improve escaping of file names. (partly by Peter Odding) Files: src/ex_docmd.c Patch 7.3.026 @@ -10656,7 +10656,7 @@ Files: src/memline.c Patch 7.3.078 Problem: Warning for unused variable. -Solution: Adjuste #ifdefs. +Solution: Adjust #ifdefs. Files: src/ops.c Patch 7.3.079 @@ -10756,7 +10756,7 @@ Solution: Use menu_name_equal(). (Alex Jakushev) Files: src/menu.c Patch 7.3.096 -Problem: "gvim -nb" is not interruptable. Leaking file descriptor on +Problem: "gvim -nb" is not interruptible. Leaking file descriptor on netbeans connection error. Solution: Check for CTRL-C typed. Free file descriptor. (Xavier de Gaye) Files: src/netbeans.c @@ -11068,7 +11068,7 @@ Files: src/syntax.c Patch 7.3.149 Problem: The cursor disappears after the processing of the 'setDot' netbeans command when vim runs in a terminal. -Solution: Show the cursor after a screen update. (Xavier de Gaye, 2011 +Solution: Show the cursor after a screen update. (Xavier de Gaye) Files: src/netbeans.c Patch 7.3.150 @@ -11153,7 +11153,7 @@ Files: src/option.c Patch 7.3.164 Problem: C-indenting: a preprocessor statement confuses detection of a - function delcaration. + function declaration. Solution: Ignore preprocessor lines. (Lech Lorens) Also recognize the style to put a comma before the argument name. Files: src/misc1.c, testdir/test3.in, testdir/test3.ok @@ -11249,7 +11249,7 @@ Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok Patch 7.3.180 Problem: When both a middle part of 'comments' matches and an end part, the - middle part was used errornously. + middle part was used erroneously. Solution: After finding the middle part match continue looking for a better end part match. (partly by Lech Lorens) Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok @@ -11483,7 +11483,7 @@ Problem: Python 3: vim.error is a 'str' instead of an 'Exception' object, so 'except' or 'raise' it causes a 'SystemError' exception. Buffer objects do not support slice assignment. When exchanging text between Vim and Python, multibyte texts become - gabage or cause Unicode Exceptions, etc. + garbage or cause Unicode Exceptions, etc. 'py3file' tries to read in the file as Unicode, sometimes causes UnicodeDecodeException Solution: Fix the problems. (lilydjwg) @@ -11918,7 +11918,7 @@ Files: src/ascii.h, src/spell.c Patch 7.3.294 (after 7.3.289) Problem: Patch 289 causes more problems than it solves. -Solution: Rever the patch untill a better solution is found. +Solution: Revert the patch until a better solution is found. Files: src/edit.c Patch 7.3.295 @@ -12679,7 +12679,7 @@ Files: src/xpm_w32.c Patch 7.3.429 Problem: When 'cpoptions' includes "E" "c0" in the first column is an - error. The redo register is then set to the errornous command. + error. The redo register is then set to the erroneous command. Solution: Do not set the redo register if the command fails because of an empty region. (Hideki Eiraku) Files: src/getchar.c, src/normal.c, src/proto/getchar.pro @@ -12923,7 +12923,7 @@ Files: src/buffer.c, src/ex_cmds.c Patch 7.3.472 Problem: Crash when using ":redraw" in a BufEnter autocommand and switching to another tab. (驼峰) -Solution: Move triggering the the autocommands to after correcting the +Solution: Move triggering the autocommands to after correcting the option values. Also check the row value to be out of bounds. (Christian Brabandt, Sergey Khorev) Files: src/screen.c, src/window.c @@ -13049,7 +13049,7 @@ Files: src/testdir/test1.in, src/testdir/test85.in, src/testdir/test85.ok Patch 7.3.492 Problem: Can't indent conditions separately from function arguments. -Solution: Add the 'k' flag in 'cino. (Lech Lorens) +Solution: Add the 'k' flag in 'cino'. (Lech Lorens) Files: runtime/doc/indent.txt, src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok @@ -13059,7 +13059,7 @@ Solution: Remove them. (Hong Xu) Files: src/misc1.c Patch 7.3.494 (after 7.3.491) -Problem: Can't compile with Lua 9.1 or dynamic Lua. +Problem: Can't compile with Lua 5.1 or dynamic Lua. Solution: Fix dll_ methods. Fix luado(). (Muraoka Taro, Luis Carvalho) Files: src/if_lua.c @@ -13208,7 +13208,7 @@ Solution: Recognize completefunction returning -3. (Matsushita Shougo) Files: src/edit.c Patch 7.3.520 -Problem: Gvim starts up slow on Unbuntu 12.04. +Problem: Gvim starts up slow on Ubuntu 12.04. Solution: Move the call to gui_mch_init_check() to after fork(). (Yasuhiro Matsumoto) Do check $DISPLAY being set. Files: src/gui.c, src/gui_gtk_x11.c, src/proto/gui_gtk_x11.pro @@ -13301,7 +13301,7 @@ Solution: In utf_islower() return true for the sharp s. Note: also need Files: src/mbyte.c Patch 7.3.537 -Problem: Unecessary call to init_spell_chartab(). +Problem: Unnecessary call to init_spell_chartab(). Solution: Delete the call. Files: src/spell.c @@ -13312,7 +13312,7 @@ Files: src/quickfix.c, src/testdir/test10.in, src/testdir/test10.ok Patch 7.3.539 Problem: Redrawing a character on the command line does not work properly - for multi-byte charactes. + for multi-byte characters. Solution: Count the number of bytes in a character. (Yukihiro Nakadaira) Files: src/ex_getln.c @@ -13639,7 +13639,7 @@ Files: runtime/doc/sign.txt, src/buffer.c, src/ex_cmds.c, Patch 7.3.597 Problem: 'clipboard' "autoselect" only applies to the * register. (Sergey Vakulenko) -Solution: Make 'autoselect' work for the + register. (Christian Brabant) +Solution: Make 'autoselect' work for the + register. (Christian Brabandt) Add the "autoselectplus" option in 'clipboard' and the "P" flag in 'guioptions'. Files: runtime/doc/options.txt, src/normal.c, src/ops.c, src/screen.c, @@ -13874,7 +13874,7 @@ Solution: Do not break out of the loop early when inside try/catch. Files: src/ex_docmd.c, src/globals.h Patch 7.3.638 -Problem: Unecessary redraw of the previous character. +Problem: Unnecessary redraw of the previous character. Solution: Check if the character is double-width. (Jon Long) Files: src/screen.c @@ -14210,7 +14210,7 @@ Solution: Free the font. (Ken Takata) Files: src/syntax.c Patch 7.3.698 -Problem: Python 3 does not preserve state beween commands. +Problem: Python 3 does not preserve state between commands. Solution: Preserve the state. (Paul Ollis) Files: src/if_python.c, src/if_python3.c @@ -14393,7 +14393,7 @@ Solution: Avoid using NULL pointer. (Christian Brabandt) Files: src/quickfix.c Patch 7.3.731 -Problem: Py3Init_vim() is exported uneccessarily. +Problem: Py3Init_vim() is exported unnecessarily. Solution: Make it static. (Ken Takata) Files: src/if_python3.c @@ -14532,7 +14532,7 @@ Patch 7.3.756 Problem: A location list can get a wrong count in :lvimgrep. Solution: Check if the list was changed by autocommands. (mostly by Christian Brabandt) -Files: src/quickfic.c +Files: src/quickfix.c Patch 7.3.757 Problem: Issue 96: May access freed memory when a put command triggers @@ -14628,7 +14628,7 @@ Files: src/mbyte.c Patch 7.3.774 Problem: Tiny GUI version misses console dialog feature. -Solution: Define FEAT_CON_DIALOG when apprpriate. (Christian Brabandt) +Solution: Define FEAT_CON_DIALOG when appropriate. (Christian Brabandt) Files: src/feature.h, src/gui.h Patch 7.3.775 @@ -14717,7 +14717,7 @@ Solution: call do_modelines(). (Ken Takata) Files: src/fileio.c Patch 7.3.791 -Problem: MzScheme interface doesn't work propely. +Problem: MzScheme interface doesn't work properly. Solution: Make it work better. (Sergey Khorev) Files: runtime/doc/if_mzsch.txt, src/configure.in, src/auto/configure, src/eval.c, src/if_mzsch.c, src/if_mzsch.h, src/Make_ming.mak, @@ -14731,7 +14731,7 @@ Solution: Do not change the text when asking for confirmation, only display Files: src/ex_cmds.c Patch 7.3.793 (after 7.3.792) -Problem: New interactive :substutite behavior is not tested. +Problem: New interactive :substitute behavior is not tested. Solution: Add tests. (Christian Brabandt) Files: src/testdir/test80.in, src/testdir/test80.ok @@ -14827,7 +14827,7 @@ Solution: Ignore $VIMRUNTIME if it is too long. Files: src/dosinst.c Patch 7.3.810 -Problem: 'relativenumber is reset unexpectedly. (François Ingelrest) +Problem: 'relativenumber' is reset unexpectedly. (François Ingelrest) Solution: After an option was reset also reset the global value. Add a test. (Christian Brabandt) Files: src/option.c, src/testdir/Make_amiga.mak, @@ -15774,7 +15774,7 @@ Solution: Include multi-byte by default, with "normal" features. Files: src/feature.h Patch 7.3.969 -Problem: Can't built with Python 3 and without Python 2. +Problem: Can't build with Python 3 and without Python 2. Solution: Adjust #ifdef. (Xavier de Gaye) Files: src/window.c @@ -15864,7 +15864,7 @@ Solution: Don't point to an integer but the characters. Files: src/regexp_nfa.c, src/testdir/test95.in, src/testdir/test95.ok Patch 7.3.983 -Problem: Uneccessary temp variable. +Problem: Unnecessary temp variable. Solution: Remove the variable. Files: src/regexp_nfa.c @@ -16018,7 +16018,7 @@ Files: src/if_py_both.h Patch 7.3.1010 Problem: New regexp: adding \Z makes every character match. Solution: Only apply ireg_icombine for composing characters. - Alsl add missing change from patch 1008. (Ken Takata) + Also add missing change from patch 1008. (Ken Takata) Files: src/regexp_nfa.c, src/testdir/test95.in, src/testdir/test95.ok Patch 7.3.1011 @@ -16108,7 +16108,7 @@ Solution: Check for "\n" character. Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok Patch 7.3.1026 -Problem: New regexp: pattern that includs a new-line matches too early. +Problem: New regexp: pattern that includes a new-line matches too early. (john McGowan) Solution: Do not start searching in the second line. Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok @@ -16281,7 +16281,7 @@ Solution: Python patch 15. (ZyX) Fix will follow later. Files: src/eval.c, src/if_py_both.h, src/proto/eval.pro Patch 7.3.1057 -Problem: Python: not enough compatibilty. +Problem: Python: not enough compatibility. Solution: Python patch 16: Make OutputWritelines support any sequence object (ZyX) Note: tests fail Files: src/if_py_both.h, src/testdir/test86.in, src/testdir/test86.ok, @@ -16330,7 +16330,7 @@ Files: src/if_py_both.h Patch 7.3.1065 Problem: Python: key mapping is not standard. -Solution: Puthon patch 24: use PyMapping_Keys. (ZyX) +Solution: Python patch 24: use PyMapping_Keys. (ZyX) Files: src/if_py_both.h, src/if_python3.c, src/if_python.c Patch 7.3.1066 @@ -16368,7 +16368,7 @@ Files: src/regexp_nfa.c, src/regexp.h, src/testdir/test64.in, src/testdir/test64.ok Patch 7.3.1072 -Problem: Compiler warning for unitialized variable. +Problem: Compiler warning for uninitialized variable. Solution: Initialize it. Files: src/regexp_nfa.c @@ -16484,7 +16484,7 @@ Files: src/regexp_nfa.c, src/regexp.h Patch 7.3.1093 Problem: New regexp engine: When a sub expression is empty \1 skips a character. -Solution: Make \1 try the current position when the match is emtpy. +Solution: Make \1 try the current position when the match is empty. Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok Patch 7.3.1094 @@ -16582,7 +16582,7 @@ Files: src/Make_bc5.mak, src/Make_cyg.mak, src/Make_ming.mak, Patch 7.3.1110 Problem: New regexp matching: Using \@= and the like can be slow. -Solution: Decide whether to first try matching the zero-wdith part or what +Solution: Decide whether to first try matching the zero-width part or what follows, whatever is more likely to fail. Files: src/regexp_nfa.c @@ -16667,7 +16667,7 @@ Solution: Allow using \%V but never match. (Dominique Pelle) Files: src/regexp_nfa.c Patch 7.3.1126 -Problem: Compiler warning for unitialized variable. (Tony Mechelynck) +Problem: Compiler warning for uninitialized variable. (Tony Mechelynck) Solution: Assign something to the variable. Files: src/regexp_nfa.c @@ -16822,12 +16822,12 @@ Files: src/regexp_nfa.c Patch 7.3.1153 Problem: New regexp engine: Some look-behind matches are very expensive. -Solution: Pospone invisible matches further, until a match is almost found. +Solution: Postpone invisible matches further, until a match is almost found. Files: src/regexp_nfa.c Patch 7.3.1154 -Problem: New regexp_nfa engine: Uneccessary code. -Solution: Remove uneccessary code. +Problem: New regexp_nfa engine: Unnecessary code. +Solution: Remove unnecessary code. Files: src/regexp_nfa.c Patch 7.3.1155 @@ -16907,7 +16907,7 @@ Files: src/configure.in, src/auto/configure Patch 7.3.1168 Problem: Python "sane" configure checks give a warning message. -Solution: Use single quotes intead of escaped double quotes. (Ben Fritz) +Solution: Use single quotes instead of escaped double quotes. (Ben Fritz) Files: src/configure.in, src/auto/configure Patch 7.3.1169 @@ -17057,7 +17057,7 @@ Solution: Tune the estimation of pattern failure chance. Files: src/regexp_nfa.c Patch 7.3.1195 -Problem: Compiler warning for unitialized variable. (Tony Mechelynck) +Problem: Compiler warning for uninitialized variable. (Tony Mechelynck) Solution: Set the length to the matching backref. Files: src/regexp.c @@ -17187,7 +17187,7 @@ Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok Patch 7.3.1218 Problem: "make test" on MS-Windows does not clean all temporary files and - gives some unneccessary message. + gives some unnecessary message. Solution: Clean the right files. Create .failed files. (Ken Takata) Files: src/testdir/Make_dos.mak @@ -17206,7 +17206,7 @@ Patch 7.3.1221 Problem: When build flags change "make distclean" run into a configure error. Solution: When CFLAGS changes delete auto/config.cache. Also avoid adding - duplicate text to flags. + duplicate text to flags. (Ken Takata) Files: src/Makefile, src/configure.in, src/auto/configure Patch 7.3.1222 @@ -17246,7 +17246,7 @@ Files: src/if_py_both.h, src/testdir/test86.ok, src/testdir/test87.ok Patch 7.3.1228 Problem: Python: various inconsistencies and problems. Solution: StringToLine now supports both bytes() and unicode() objects. - Make function names consistant. Fix memory leak fixed in + Make function names consistent. Fix memory leak fixed in StringToLine. (ZyX) Files: src/if_py_both.h, src/if_python3.c, src/if_python.c @@ -17478,7 +17478,7 @@ Solution: Implement more ACL support. (Ken Takata) Files: src/os_win32.c Patch 7.3.1268 -Problem: ACL support doesn't work when when compiled with MingW. +Problem: ACL support doesn't work when compiled with MingW. Solution: Support ACL on MingW. (Ken Takata) Files: src/os_win32.c, src/os_win32.h @@ -17621,7 +17621,7 @@ Solution: Initialize the variables. Files: src/screen.c Patch 7.3.1292 -Problem: Possibly using invalid pointer when searcing for window. (Raichoo) +Problem: Possibly using invalid pointer when searching for window. (Raichoo) Solution: Use "firstwin" instead of "tp_firstwin" for current tab. Files: src/window.c diff --git a/runtime/plugin/tohtml.vim b/runtime/plugin/tohtml.vim index c7fa8caae2..eb47b1a7c3 100644 --- a/runtime/plugin/tohtml.vim +++ b/runtime/plugin/tohtml.vim @@ -1,6 +1,6 @@ " Vim plugin for converting a syntax highlighted file to HTML. " Maintainer: Ben Fritz <fritzophrenic@gmail.com> -" Last Change: 2013 Jun 26 +" Last Change: 2013 Jul 08 " " The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and " $VIMRUNTIME/syntax/2html.vim @@ -67,12 +67,15 @@ if exists('g:loaded_2html_plugin') finish endif -let g:loaded_2html_plugin = 'vim7.3_v14' +let g:loaded_2html_plugin = 'vim7.4_v1' " " Changelog: {{{ +" 7.4_v1 (this version): Fix modeline mangling for new "Vim:" format, and +" also for version-specific modelines like "vim>703:". " -" 7.3_v14 (this version): Allow suppressing line number anchors using +" 7.3 updates: {{{ +" 7.3_v14 (ad6996a23e3e): Allow suppressing line number anchors using " g:html_line_ids=0. Allow customizing " important IDs (like line IDs and fold IDs) using " g:html_id_expr evalutated when the buffer conversion @@ -162,6 +165,7 @@ let g:loaded_2html_plugin = 'vim7.3_v14' " 7.3_v1 (e7751177126b): Add conceal support and meta tags in output " Pre-v1 baseline: Mercurial changeset 3c9324c0800e "}}} +"}}} " Define the :TOhtml command when: " - 'compatible' is not set diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim index 8001751c5b..187b1be1b0 100644 --- a/runtime/syntax/2html.vim +++ b/runtime/syntax/2html.vim @@ -1,6 +1,6 @@ " Vim syntax support file " Maintainer: Ben Fritz <fritzophrenic@gmail.com> -" Last Change: 2013 Jun 19 +" Last Change: 2013 Jul 08 " " Additional contributors: " @@ -1604,7 +1604,7 @@ unlet s:lines " this file in the future; need to do this after generating all the text in case " the modeline text has different highlight groups which all turn out to be " stripped from the final output. -%s!\v(%(^|\s+)%(vim?|ex)):!\1\:!ge +%s!\v(%(^|\s+)%([Vv]i%(m%([<=>]?\d+)?)?|ex)):!\1\:!ge " The generated HTML is admittedly ugly and takes a LONG time to fold. " Make sure the user doesn't do syntax folding when loading a generated file, diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim index ee5563e6bd..807c78b8c4 100644 --- a/runtime/syntax/help.vim +++ b/runtime/syntax/help.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Vim help file " Maintainer: Bram Moolenaar (Bram@vim.org) -" Last Change: 2013 Jun 02 +" Last Change: 2013 Jul 07 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -14,7 +14,11 @@ set cpo&vim syn match helpHeadline "^[-A-Z .][-A-Z0-9 .()]*[ \t]\+\*"me=e-1 syn match helpSectionDelim "^===.*===$" syn match helpSectionDelim "^---.*--$" -syn region helpExample matchgroup=helpIgnore start=" >$" start="^>$" end="^[^ \t]"me=e-1 end="^<" +if has("conceal") + syn region helpExample matchgroup=helpIgnore start=" >$" start="^>$" end="^[^ \t]"me=e-1 end="^<" concealends +else + syn region helpExample matchgroup=helpIgnore start=" >$" start="^>$" end="^[^ \t]"me=e-1 end="^<" +endif if has("ebcdic") syn match helpHyperTextJump "\\\@<!|[^"*|]\+|" contains=helpBar syn match helpHyperTextEntry "\*[^"*|]\+\*\s"he=e-1 contains=helpStar @@ -58,7 +62,6 @@ syn match helpSpecial "\[N]" syn match helpSpecial "N N"he=s+1 syn match helpSpecial "Nth"me=e-2 syn match helpSpecial "N-1"me=e-2 -syn match helpSpecial "{[-a-zA-Z0-9'":%#=[\]<>.,]\+}" syn match helpSpecial "{[-a-zA-Z0-9'"*+/:%#=[\]<>.,]\+}" syn match helpSpecial "\s\[[-a-z^A-Z0-9_]\{2,}]"ms=s+1 syn match helpSpecial "<[-a-zA-Z0-9_]\+>" diff --git a/src/po/nl.po b/src/po/nl.po index 23dc99e97a..4750d4dbb5 100644 --- a/src/po/nl.po +++ b/src/po/nl.po @@ -18,204 +18,152 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: blowfish.c:418 msgid "E831: bf_key_init() called with empty password" msgstr "E831: bf_key_init() uitgevoerd met leeg wachtwoord" -#: blowfish.c:513 msgid "E820: sizeof(uint32_t) != 4" msgstr "E820: sizeof(uint32_t) != 4" -#: blowfish.c:532 msgid "E817: Blowfish big/little endian use wrong" msgstr "E817: gebruik Blowfish big/little endian is onjuist" -#: blowfish.c:645 msgid "E818: sha256 test failed" msgstr "E818: sha256 test mislukt" -#: blowfish.c:650 msgid "E819: Blowfish test failed" msgstr "E819: Blowfish test mislukt" -#: buffer.c:103 msgid "E82: Cannot allocate any buffer, exiting..." msgstr "E82: kan geen buffer aanmaken, beëindigen..." -#: buffer.c:106 msgid "E83: Cannot allocate buffer, using other one..." msgstr "E83: kan geen buffer aanmaken, een andere wordt gebruikt..." -#: buffer.c:879 msgid "E515: No buffers were unloaded" msgstr "E515: geen van de buffers is gelost" -#: buffer.c:881 msgid "E516: No buffers were deleted" msgstr "E516: geen van de buffers is verwijderd" -#: buffer.c:883 msgid "E517: No buffers were wiped out" msgstr "E517: geen van de buffers is gewist" -#: buffer.c:891 msgid "1 buffer unloaded" msgstr "1 buffer gelost" -#: buffer.c:893 #, c-format msgid "%d buffers unloaded" msgstr "%d buffers gelost" -#: buffer.c:898 msgid "1 buffer deleted" msgstr "1 buffer verwijderd" -#: buffer.c:900 #, c-format msgid "%d buffers deleted" msgstr "%d buffers verwijderd" -#: buffer.c:905 msgid "1 buffer wiped out" msgstr "1 buffer gewist" -#: buffer.c:907 #, c-format msgid "%d buffers wiped out" msgstr "%d buffers gewist" -#: buffer.c:965 msgid "E84: No modified buffer found" msgstr "E84: geen aangepast buffer gevonden" #. back where we started, didn't find anything. -#: buffer.c:1004 msgid "E85: There is no listed buffer" msgstr "E85: er is geen vermelde buffer" -#: buffer.c:1016 #, c-format msgid "E86: Buffer %ld does not exist" msgstr "E86: Buffer %ld bestaat niet" -#: buffer.c:1019 msgid "E87: Cannot go beyond last buffer" msgstr "E87: kan niet voorbij het laatste buffer komen" -#: buffer.c:1021 msgid "E88: Cannot go before first buffer" msgstr "E88: kan niet vóór het eerste buffer komen" -#: buffer.c:1063 #, c-format msgid "E89: No write since last change for buffer %ld (add ! to override)" msgstr "E89: niets opgeslagen sinds laatste wijziging van buffer %ld (voeg ! toe om te forceren)" -#: buffer.c:1080 msgid "E90: Cannot unload last buffer" msgstr "E90: kan laatste buffer niet legen" -#: buffer.c:1657 msgid "W14: Warning: List of file names overflow" msgstr "W14: waarschuwing: lijst met bes |