Snapshot 68

Fix drawing of wide glyphs in Core Text renderer
Merge branch 'vim'
2026-06-02 11:19:22 +02:00 · 2013-07-12 09:43:09 +02:00 · 2013-07-10 10:08:07 +02:00 · 2013-07-09 19:48:32 +02:00 · 2013-07-09 19:25:35 +02:00 · 2013-07-09 17:42:46 +02:00
45 changed files with 3429 additions and 4158 deletions
@@ -2653,3 +2653,11 @@ afbc9dd67cea81e73d64f7ecce47dfcd35d48865 v7-3-1313
 29e57603bf6f3a2e3c178a63d332ed4d2eccfa82 v7-3-1314
 6ec6b7ff2d43842d04a8d653356d0ff3850707c0 v7-4a
 0ddba00c204d855c0b3da30cb338d9bdb0ded847 v7-4a-001
+d0288faf3086e6ccd5046edc91f1baf21bf1babf v7-4a-002
+b5abda4e7c4b8b04cb823c160c47097448823ba8 v7-4a-003
+f72d49c406c48293e30d774303493e4c8d120bfb v7-4a-004
+7a6ce0c426fec6051523bb00e050b826fa664beb v7-4a-005
+6b6e1786c7dfb2d1190373dfddc3cd33e5346e18 v7-4a-006
+c624928fbc49408ab932e5c79f5f79e53327d700 v7-4a-007
+b3bd43ef012d975cafb7b2a4c41fb78486ee4cc0 v7-4a-008
+467efeee8f9e2060891bc718e6aeffaf79eab43b v7-4a-009
@@ -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%.%#
@@ -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
@@ -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
@@ -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
@@ -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")
@@ -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!
@@ -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,
@@ -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
@@ -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
@@ -4748,7 +4748,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
@@ -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)

@@ -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
@@ -5996,7 +5996,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

@@ -8789,7 +8789,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

@@ -10339,7 +10339,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
@@ -10658,7 +10658,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
@@ -10758,7 +10758,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
@@ -11070,7 +11070,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
@@ -11155,7 +11155,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
@@ -11251,7 +11251,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
@@ -11485,7 +11485,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)
@@ -11920,7 +11920,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
@@ -12681,7 +12681,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
@@ -12925,7 +12925,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
@@ -13051,7 +13051,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

@@ -13061,7 +13061,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

@@ -13210,7 +13210,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
@@ -13303,7 +13303,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

@@ -13314,7 +13314,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

@@ -13641,7 +13641,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,
@@ -13876,7 +13876,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

@@ -14212,7 +14212,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

@@ -14395,7 +14395,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

@@ -14534,7 +14534,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
@@ -14630,7 +14630,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
@@ -14719,7 +14719,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,
@@ -14733,7 +14733,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

@@ -14829,7 +14829,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,
@@ -15776,7 +15776,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

@@ -15866,7 +15866,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

@@ -16020,7 +16020,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
@@ -16110,7 +16110,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
@@ -16283,7 +16283,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,
@@ -16332,7 +16332,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
@@ -16370,7 +16370,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

@@ -16486,7 +16486,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
@@ -16584,7 +16584,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

@@ -16669,7 +16669,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

@@ -16824,12 +16824,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
@@ -16909,7 +16909,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
@@ -17059,7 +17059,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

@@ -17189,7 +17189,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

@@ -17208,7 +17208,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
@@ -17248,7 +17248,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

@@ -17480,7 +17480,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

@@ -17623,7 +17623,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

@@ -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
@@ -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\&#0058;!ge
+%s!\v(%(^|\s+)%([Vv]i%(m%([<=>]?\d+)?)?|ex)):!\1\&#0058;!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,
@@ -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_]\+>"
@@ -1232,7 +1232,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>67</string>
+	<string>68</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
@@ -614,7 +614,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 67;
+				CURRENT_PROJECT_VERSION = 68;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -645,7 +645,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 67;
+				CURRENT_PROJECT_VERSION = 68;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -421,6 +421,9 @@ MSVCVER = 11.0
 !if "$(_NMAKE_VER)" == "11.00.60315.1"
 MSVCVER = 11.0
 !endif
+!if "$(_NMAKE_VER)" == "11.00.60610.1"
+MSVCVER = 11.0
+!endif
 !endif

 # Abort building VIM if version of VC is unrecognised.
@@ -1866,7 +1866,7 @@ types.vim: $(TAGS_SRC) $(TAGS_INCL)
 #
 test check:
 	$(MAKE) -f Makefile $(VIMTARGET)
-	-if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
+	if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
 		cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \
 	fi
 	-if test $(VIMTARGET) != vim -a ! -r vim; then \
@@ -2500,9 +2500,12 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
 			gui_mch_set_font(wide_font);
 		    gui_mch_draw_string(gui.row, scol, s + start, thislen,
 #  ifdef FEAT_GUI_MACVIM
-								  cells,
+				    cells,
+				    draw_flags | (prev_wide ? DRAW_WIDE : 0)
+# else
+				    draw_flag
 #  endif
-								  draw_flags);
+				    );
 		    if (prev_wide)
 			gui_mch_set_font(font);
 		    start += thislen;
@@ -3102,7 +3102,7 @@ logfont2name(LOGFONT lf)
 * 'guifont'
 */
    static void
-update_im_font()
+update_im_font(void)
 {
    LOGFONT	lf_wide;

@@ -2100,7 +2100,7 @@ ListNew(PyTypeObject *subtype, list_T *list)
 }

    static list_T *
-py_list_alloc()
+py_list_alloc(void)
 {
    list_T	*ret;

@@ -5857,7 +5857,7 @@ init_structs(void)
 	return -1;

    static int
-init_types()
+init_types(void)
 {
    PYTYPE_READY(IterType);
    PYTYPE_READY(BufferType);
@@ -86,7 +86,8 @@
 #ifndef PyString_Check
 # define PyString_Check(obj) PyUnicode_Check(obj)
 #endif
-#define PyString_FromString(repr) PyUnicode_FromString(repr)
+#define PyString_FromString(repr) \
+    PyUnicode_Decode(repr, STRLEN(repr), ENC_OPT, NULL)
 #define PyString_FromFormat PyUnicode_FromFormat
 #ifndef PyInt_Check
 # define PyInt_Check(obj) PyLong_Check(obj)
@@ -4718,7 +4718,8 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
 	    {
 		wc_path = vim_strsave(search_ctx->ffsc_wc_path);
 		temp = alloc((int)(STRLEN(search_ctx->ffsc_wc_path)
-				 + (STRLEN(search_ctx->ffsc_fix_path)) - len));
+				 + STRLEN(search_ctx->ffsc_fix_path + len)
+				 + 1));
 	    }

 	    if (temp == NULL || wc_path == NULL)
@@ -8254,6 +8254,11 @@ nv_g_cmd(cap)
 			i += ((curwin->w_virtcol - width1) / width2 + 1)
 								     * width2;
 		    coladvance((colnr_T)i);
+
+		    /* Make sure we stick in this column. */
+		    validate_virtcol();
+		    curwin->w_curswant = curwin->w_virtcol;
+		    curwin->w_set_curswant = FALSE;
 #if defined(FEAT_LINEBREAK) || defined(FEAT_MBYTE)
 		    if (curwin->w_cursor.col > 0 && curwin->w_p_wrap)
 		    {
@@ -8262,7 +8267,6 @@ nv_g_cmd(cap)
 			 * the end of the line.  We do not want to advance to
 			 * the next screen line.
 			 */
-			validate_virtcol();
 			if (curwin->w_virtcol > (colnr_T)i)
 			    --curwin->w_cursor.col;
 		    }
@@ -7888,7 +7888,10 @@ set_bool_option(opt_idx, varp, value, opt_flags)
    else if ((int *)varp == &curwin->w_p_scb)
    {
 	if (curwin->w_p_scb)
+	{
 	    do_check_scrollbind(FALSE);
+	    curwin->w_scbind_pos = curwin->w_topline;
+	}
    }
 #endif

@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim_7.3_ru\n"
+"Project-Id-Version: vim_7.4_ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 13:52+0400\n"
-"PO-Revision-Date: 2013-06-01 14:16+0400\n"
+"POT-Creation-Date: 2013-07-08 00:47+0400\n"
+"PO-Revision-Date: 2013-07-08 00:47+0400\n"
 "Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
 "Language-Team: \n"
 "Language: Russian\n"
@@ -423,6 +423,9 @@ msgstr "E130:
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Íåäîïóñòèìîå èìÿ ïåðåìåííîé: %s"

+msgid "E806: using Float as a String"
+msgstr "E806: Èñïîëüçîâàíèå ÷èñëà ñ ïëàâàþùåé òî÷êîé êàê ñòðîêè"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: Öåëåé ìåíüøå ÷åì ýëåìåíòîâ ñïèñêà"

@@ -582,13 +585,13 @@ msgstr "E785: complete()
 msgid "&Ok"
 msgstr "&Ok"

-msgid "extend() argument"
-msgstr "ïàðàìåòð extend()"
-
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: Êëþ÷ óæå ñóùåñòâóåò: %s"

+msgid "extend() argument"
+msgstr "ïàðàìåòð extend()"
+
 msgid "map() argument"
 msgstr "ïàðàìåòð map()"

@@ -686,9 +689,6 @@ msgstr "E730:
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Èñïîëüçîâàíèå ñëîâàðÿ êàê ñòðîêè"

-msgid "E806: using Float as a String"
-msgstr "E806: Èñïîëüçîâàíèå ÷èñëà ñ ïëàâàþùåé òî÷êîé êàê ñòðîêè"
-
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: Íåñîîòâåòñòâèå òèïà ïåðåìåííîé äëÿ: %s"
@@ -729,6 +729,9 @@ msgstr "E123:
 msgid "E124: Missing '(': %s"
 msgstr "E124: Ïðîïóùåíà '(': %s"

+msgid "E862: Cannot use g: here"
+msgstr "E862: Çäåñü íåâîçìîæíî èñïîëüçîâàòü g:"
+
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: Íåäîïóñòèìûé ïàðàìåòð: %s"
@@ -1000,6 +1003,10 @@ msgstr "E148:
 msgid "Pattern found in every line: %s"
 msgstr "Ñîîòâåòñòâèå øàáëîíó íàéäåíî íà êàæäîé ñòðîêå: %s"

+#, c-format
+msgid "Pattern not found: %s"
+msgstr "Øàáëîí íå íàéäåí: %s"
+
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -2261,32 +2268,28 @@ msgid "Font '%s' is not fixed-width"
 msgstr "Øðèôò '%s' íå ÿâëÿåòñÿ ìîíîøèðèííûì"

 #, c-format
-msgid "E253: Fontset name: %s\n"
-msgstr "E253: Íàáîð øðèôòîâ: %s\n"
+msgid "E253: Fontset name: %s"
+msgstr "E253: Íàáîð øðèôòîâ: %s"

 #, c-format
-msgid "Font0: %s\n"
-msgstr "Font0: %s\n"
+msgid "Font0: %s"
+msgstr "Font0: %s"

 #, c-format
-msgid "Font1: %s\n"
-msgstr "Font1: %s\n"
+msgid "Font1: %s"
+msgstr "Font1: %s"

 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "Øèðèíà øðèôòà font%ld äîëæíà áûòü âäâîå áîëüøå øèðèíû øðèôòà font0\n"
+msgid "Font%ld width is not twice that of font0"
+msgstr "Øèðèíà øðèôòà font%ld äîëæíà áûòü âäâîå áîëüøå øèðèíû øðèôòà font0"

 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Øèðèíà øðèôòà font0: %ld\n"
+msgid "Font0 width: %ld"
+msgstr "Øèðèíà øðèôòà font0: %ld"

 #, c-format
-msgid ""
-"Font1 width: %ld\n"
-"\n"
-msgstr ""
-"Øèðèíà øðèôòà font1: %ld\n"
-"\n"
+msgid "Font1 width: %ld"
+msgstr "Øèðèíà øðèôòà font1: %ld"

 msgid "Invalid font specification"
 msgstr "Íåïðàâèëüíîå îïðåäåëåíèå øðèôòà"
@@ -2474,8 +2477,11 @@ msgstr "E566:
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Íåâîçìîæíî âûïîëíèòü fork() äëÿ cscope"

+msgid "cs_create_connection setpgid failed"
+msgstr "cs_create_connection: íå óäàëîñü âûïîëíèòü setpgid"
+
 msgid "cs_create_connection exec failed"
-msgstr "íå óäàëîñü âûïîëíèòü cs_create_connection"
+msgstr "cs_create_connection: íå óäàëîñü âûïîëíèòü exec"

 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: íå óäàëîñü âûïîëíèòü fdopen äëÿ to_fp"
@@ -2641,9 +2647,6 @@ msgstr "
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: Äàííûé Vim íå ìîæåò âûïîëíèòü :python ïîñëå èñïîëüçîâàíèÿ :py3"

-msgid "only string keys are allowed"
-msgstr "äîïóñòèìû òîëüêî ñòðîêîâûå êëþ÷è"
-
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
@@ -2654,27 +2657,9 @@ msgstr ""
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Íåâîçìîæíî âûïîëíèòü ðåêóðñèâíûé âûçîâ Python"

-msgid "E858: Eval did not return a valid python object"
-msgstr "E858: Eval íå âîçâðàòèë äîïóñòèìîãî îáúåêòà Python"
-
-msgid "E859: Failed to convert returned python object to vim value"
-msgstr ""
-"E859: Íå óäàëîñü ïðåîáðàçîâàòü âîçâðàù¸ííûé îáúåêò Python â çíà÷åíèå VIM"
-
-#, c-format
-msgid "<buffer object (deleted) at %p>"
-msgstr "<îáúåêò áóôåðà (óäàëåí) â %p>"
-
 msgid "E837: This Vim cannot execute :py3 after using :python"
 msgstr "E837: Äàííûé Vim íå ìîæåò âûïîëíèòü :py3 ïîñëå èñïîëüçîâàíèÿ :python"

-msgid "E860: Eval did not return a valid python 3 object"
-msgstr "E860: Eval íå âîçâðàòèë äîïóñòèìîãî îáúåêòà Python 3"
-
-msgid "E861: Failed to convert returned python 3 object to vim value"
-msgstr ""
-"E861: Íå óäàëîñü ïðåîáðàçîâàòü âîçâðàù¸ííûé îáúåêò Python 3 â çíà÷åíèå VIM"
-
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ äîëæåí áûòü ýêçåìïëÿðîì èëè ñòðîêîé"

@@ -4780,18 +4765,9 @@ msgstr "E777:
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: Íåäîïóñòèìûé ýëåìåíò â %s%%[]"

-msgid "E339: Pattern too long"
-msgstr "E339: Ñëèøêîì äëèííûé øàáëîí"
-
-msgid "E50: Too many \\z("
-msgstr "E50: Ñëèøêîì ìíîãî \\z("
-
 #, c-format
-msgid "E51: Too many %s("
-msgstr "E51: Ñëèøêîì ìíîãî %s("
-
-msgid "E52: Unmatched \\z("
-msgstr "E52: Íåò ïàðû äëÿ \\z("
+msgid "E769: Missing ] after %s["
+msgstr "E769: Ïðîïóùåíà ] ïîñëå %s["

 #, c-format
 msgid "E53: Unmatched %s%%("
@@ -4805,6 +4781,33 @@ msgstr "E54:
 msgid "E55: Unmatched %s)"
 msgstr "E55: Íåò ïàðû äëÿ %s)"

+msgid "E66: \\z( not allowed here"
+msgstr "E66: \\z( íå ìîæåò áûòü èñïîëüçîâàíî çäåñü"
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 è ò.ï. íå ìîãóò áûòü èñïîëüçîâàíû çäåñü"
+
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: Ïðîïóùåíà ] ïîñëå %s%%["
+
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: Ïóñòîå %s%%[]"
+
+msgid "E339: Pattern too long"
+msgstr "E339: Ñëèøêîì äëèííûé øàáëîí"
+
+msgid "E50: Too many \\z("
+msgstr "E50: Ñëèøêîì ìíîãî \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: Ñëèøêîì ìíîãî %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: Íåò ïàðû äëÿ \\z("
+
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: Íåäîïóñòèìûé ñèìâîë ïîñëå %s@"
@@ -4831,23 +4834,9 @@ msgstr "E64: %s%c
 msgid "E65: Illegal back reference"
 msgstr "E65: Íåäîïóñòèìàÿ îáðàòíàÿ ññûëêà"

-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( íå ìîæåò áûòü èñïîëüçîâàíî çäåñü"
-
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 è ò.ï. íå ìîãóò áûòü èñïîëüçîâàíû çäåñü"
-
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Íåäîïóñòèìûé ñèìâîë ïîñëå \\z"

-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: Ïðîïóùåíà ] ïîñëå %s%%["
-
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: Ïóñòîå %s%%[]"
-
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: Íåäîïóñòèìûé ñèìâîë ïîñëå %s%%[dxouU]"
@@ -4856,10 +4845,6 @@ msgstr "E678:
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: Íåäîïóñòèìûé ñèìâîë ïîñëå %s%%"

-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: Ïðîïóùåíà ] ïîñëå %s["
-
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Ñèíòàêñè÷åñêàÿ îøèáêà â %s{...}"
@@ -4867,6 +4852,81 @@ msgstr "E554:
 msgid "External submatches:\n"
 msgstr "Âíåøíèå ïîäñîîòâåòñòâèÿ:\n"

+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: ïîñëå \\%#= ìîæåò áûòü òîëüêî 0, 1 èëè 2. Áóäåò èñïîëüçîâàòüñÿ "
+"àâòîìàòè÷åñêàÿ ìàøèíà"
+
+#, c-format
+msgid "E866: (NFA regexp) Misplaced %c"
+msgstr "E866: (ðåã. âûðàæåíèå ÍÊÀ) íåîæèäàííûé %c"
+
+msgid "E865: (NFA) Regexp end encountered prematurely"
+msgstr "E865: (ÍÊÀ) íåîæèäàííûé êîíåö ðåãóëÿðíîãî âûðàæåíèÿ"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\z%c'"
+msgstr "E867: (ÍÊÀ) íåèçâåñòíûé îïåðàòîð '\\z%c'"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (ÍÊÀ) íåèçâåñòíûé îïåðàòîð '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: îøèáêà ïðè ñîçäàíèè ÍÊÀ ñ êëàññîì ýêâèâàëåíòíîñòè!"
+
+#, c-format
+msgid "E869: (NFA) Unknown operator '\\@%c'"
+msgstr "E869: (ÍÊÀ) íåèçâåñòíûé îïåðàòîð '\\@%c'"
+
+msgid "E870: (NFA regexp) Error reading repetition limits"
+msgstr "E870: (ðåã. âûðàæåíèå ÍÊÀ) îøèáêà ïðè ÷òåíèè ãðàíèö ïîâòîðåíèÿ"
+
+#. Can't have a multi follow a multi.
+msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+msgstr "E871: (ðåã. âûðàæåíèå ÍÊÀ) ìíîæåñòâî íå ìîæåò ñëåäîâàòü çà ìíîæåñòâîì!"
+
+#. Too many `('
+msgid "E872: (NFA regexp) Too many '('"
+msgstr "E872: (ðåã. âûðàæåíèå ÍÊÀ) ñëèøêîì ìíîãî '('"
+
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (ðåã. âûðàæåíèå ÍÊÀ) ñëèøêîì ìíîãî \\z("
+
+msgid "E873: (NFA regexp) proper termination error"
+msgstr "E873: (ðåã. âûðàæåíèå ÍÊÀ) îøèáêà êîððåêòíîãî çàâåðøåíèÿ"
+
+msgid "E874: (NFA) Could not pop the stack !"
+msgstr "E874: (ðåã. âûðàæåíèå ÍÊÀ) íåâîçìîæíî âçÿòü èç ñòåêà!"
+
+msgid ""
+"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
+"left on stack"
+msgstr ""
+"E875: (ðåã. âûðàæåíèå ÍÊÀ) â ñòåêå îñòàëîñü ñëèøêîì ìíîãî ñîñòîÿíèé (ïðè "
+"ïðåîáðàçîâàíèè èç postfix â ÍÊÀ)"
+
+msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
+msgstr "E876: (ðåã. âûðàæåíèå ÍÊÀ) íåäîñòàòî÷íî ìåñòà äëÿ õðàíåíèÿ âñåãî ÍÊÀ"
+
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (ÍÊÀ) íåâîçìîæíî âûäåëèòü ïàìÿòü äëÿ ïðîõîäà âåòâè!"
+
+msgid ""
+"Could not open temporary log file for writing, displaying on stderr ... "
+msgstr ""
+"Íåâîçìîæíî îòêðûòü ôàéë âðåìåííîãî æóðíàëà äëÿ çàïèñè, âûâîä íà stderr..."
+
+#, c-format
+msgid "(NFA) COULD NOT OPEN %s !"
+msgstr "(ÍÊÀ) íåâîçìîæíî îòêðûòü %s!"
+
+msgid "Could not open temporary log file for writing "
+msgstr "Íåâîçìîæíî îòêðûòü ôàéë âðåìåííîãî æóðíàëà äëÿ çàïèñè"
+
 msgid " VREPLACE"
 msgstr " ÂÈÐÒÓÀËÜÍÀß ÇÀÌÅÍÀ"

@@ -5367,6 +5427,9 @@ msgstr "E782:
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: Ïîâòîðÿþùèéñÿ ñèìâîë â ýëåìåíòå MAP"

+msgid "No Syntax items defined for this buffer"
+msgstr "Ñèíòàêñè÷åñêèå ýëåìåíòû äëÿ äàííîãî áóôåðà íå îïðåäåëåíû"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Íåäîïóñòèìûé ïàðàìåòð: %s"
@@ -5375,9 +5438,6 @@ msgstr "E390:
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Ñèíòàêñè÷åñêèé êëàñòåð %s íå íàéäåí"

-msgid "No Syntax items defined for this buffer"
-msgstr "Ñèíòàêñè÷åñêèå ýëåìåíòû äëÿ äàííîãî áóôåðà íå îïðåäåëåíû"
-
 msgid "syncing on C-style comments"
 msgstr "Ñèíõðîíèçàöèÿ ïî êîììåíòàðèÿì â ñòèëå ÿçûêà C"

@@ -5504,6 +5564,11 @@ msgstr "E409:
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Íåïðàâèëüíàÿ ïîäêîìàíäà :syntax: %s"

+msgid ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+msgstr ""
+"  ÂÑÅÃÎ       ÊÎË.  ÑÎÎÒÂ. ÎÒÑÒÀÞÙÈÉ    ÑÐÅÄÍÈÉ    ÈÌß                ØÀÁËÎÍ"
+
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: Ðåêóðñèâíàÿ ïåòëÿ ïðè çàãðóçêå syncolor.vim"

@@ -6573,110 +6638,246 @@ msgstr "
 msgid "Need encryption key for \"%s\""
 msgstr "Òðåáóåòñÿ êëþ÷ øèôðîâàíèÿ äëÿ \"%s\""

+msgid "empty keys are not allowed"
+msgstr "Ïóñòûå êëþ÷è íå äîïóñòèìû"
+
+msgid "dictionary is locked"
+msgstr "Ñëîâàðü çàáëîêèðîâàí"
+
+msgid "list is locked"
+msgstr "Ñïèñîê çàáëîêèðîâàí"
+
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "Íåâîçìîæíî äîáàâèòü êëþ÷ '%s' ê ñëîâàðþ"
+
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "Èíäåêñ äîëæåí áûòü öåëûì ÷èñëîì èëè âûáîðêîé, à íå %s"
+
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "Îæèäàëñÿ ýêçåìïëÿð str() èëè unicode(), íî ïîëó÷åí %s"
+
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "Îæèäàëñÿ ýêçåìïëÿð bytes() èëè str(), íî ïîëó÷åí %s"
+
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr "Îæèäàëîñü int(), long() èëè ÷òî-òî ïðèâîäèìîå ê long(), íî ïîëó÷åíî %s"
+
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "Îæèäàëîñü int() èëè ÷òî-òî ïðèâîäèìîå ê int(), íî ïîëó÷åíî %s"
+
+msgid "value is too large to fit into C int type"
+msgstr "Çíà÷åíèå ñëèøêîì âåëèêî äëÿ öåëî÷èñëåííîãî òèïà C"
+
+msgid "value is too small to fit into C int type"
+msgstr "Çíà÷åíèå ñëèøêîì ìàëî äëÿ öåëî÷èñëåííîãî òèïà C"
+
+msgid "number must be greater then zero"
+msgstr "Íîìåð äîëæåí áûòü áîëüøå íóëÿ"
+
+msgid "number must be greater or equal to zero"
+msgstr "Íîìåð äîëæåí áûòü áîëüøå èëè ðàâåí íóëþ"
+
 msgid "can't delete OutputObject attributes"
-msgstr "íåâîçìîæíî óäàëèòü àòðèáóòû OutputObject"
+msgstr "Íåâîçìîæíî óäàëèòü àòðèáóòû OutputObject"

-msgid "softspace must be an integer"
-msgstr "çíà÷åíèå softspace äîëæíî áûòü öåëûì ÷èñëîì"
-
-msgid "invalid attribute"
-msgstr "íåïðàâèëüíûé àòðèáóò"
-
-msgid "writelines() requires list of strings"
-msgstr "writelines() òðåáóåò óêàçàíèÿ ñïèñêà ñòðîê"
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "Íåïðàâèëüíûé àòðèáóò: %s"

 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: Îøèáêà èíèöèàëèçàöèè îáúåêòîâ I/O"

-msgid "no such buffer"
-msgstr "íåò òàêîãî áóôåðà"
+msgid "failed to change directory"
+msgstr "Íåâîçìîæíî ñìåíèòü êàòàëîã"

-msgid "empty keys are not allowed"
-msgstr "ïóñòûå êëþ÷è íå äîïóñòèìû"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "Îæèäàëñÿ 3-êîðòåæ êàê ðåçóëüòàò imp.find_module(), íî ïîëó÷åí %s"

-msgid "failed to add key to dictionary"
-msgstr "íåâîçìîæíî äîáàâèòü êëþ÷ ê ñëîâàðþ"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr ""
+"Îæèäàëñÿ 3-êîðòåæ êàê ðåçóëüòàò imp.find_module(), íî ïîëó÷åí êîðòåæ ñ "
+"ðàçìåðîì %d"

-msgid "Cannot delete DictionaryObject attributes"
-msgstr "Íåâîçìîæíî óäàëèòü àòðèáóòû DictionaryObject"
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "Âíóòðåííÿÿ îøèáêà: imp.find_module âîçâðàòèë "

-msgid "Cannot modify fixed dictionary"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "Íåâîçìîæíî óäàëèòü àòðèáóòû vim.Dictionary"
+
+msgid "cannot modify fixed dictionary"
 msgstr "Íåâîçìîæíî èçìåíèòü ôèêñèðîâàííûé ñëîâàðü"

-msgid "Only boolean objects are allowed"
-msgstr "Ðàçðåøåíî èñïîëüçîâàòü òîëüêî ëîãè÷åñêèå îáúåêòû"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "Íåâîçìîæíî óñòàíîâèòü àòðèáóò %s"

-msgid "Cannot set this attribute"
-msgstr "Íåâîçìîæíî óñòàíîâèòü ýòîò àòðèáóò"
+msgid "hashtab changed during iteration"
+msgstr "Õýø-òàáëèöà èçìåíèëàñü ïðè èòåðàöèè"

-msgid "no such key in dictionary"
-msgstr "íåò òàêîãî êëþ÷à â ñëîâàðå"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr ""
+"Îæèäàëñÿ ýëåìåíò-ïîñëåäîâàòåëüíîñòü ðàçìåðà 2, à ðàçìåð ïîëó÷åííîé "
+"ïîñëåäîâàòåëüíîñòè %d"

-msgid "dict is locked"
-msgstr "ñëîâàðü çàáëîêèðîâàí"
+msgid "list constructor does not accept keyword arguments"
+msgstr "Êîíñòðóêòîð ñïèñêà íå äîïóñêàåò êëþ÷åâûå ñëîâà êàê àðãóìåíòû"

-msgid "internal error: failed to get vim list item"
-msgstr "âíóòðåííÿÿ îøèáêà: íå óäàëîñü ïîëó÷èòü ýëåìåíò ñïèñêà VIM"
+msgid "list index out of range"
+msgstr "Èíäåêñ ñïèñêà çà ïðåäåëàìè äèàïàçîíà"

-msgid "list is locked"
-msgstr "ñïèñîê çàáëîêèðîâàí"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "Âíóòðåííÿÿ îøèáêà: íå óäàëîñü ïîëó÷èòü ýëåìåíò VIM-ñïèñêà %d"

-msgid "Failed to add item to list"
+msgid "failed to add item to list"
 msgstr "Íåâîçìîæíî äîáàâèòü ýëåìåíò â ñïèñîê"

-msgid "internal error: no vim list item"
-msgstr "âíóòðåííÿÿ îøèáêà: íåò ýëåìåíòà ñïèñêà VIM"
-
-msgid "can only assign lists to slice"
-msgstr "íàçíà÷åíèå âûáîðêè âîçìîæíî òîëüêî äëÿ ñïèñêîâ"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "Âíóòðåííÿÿ îøèáêà: íåò ýëåìåíòà VIM-ñïèñêà %d"

 msgid "internal error: failed to add item to list"
-msgstr "âíóòðåííÿÿ îøèáêà: íå óäàëîñü äîáàâèòü ýëåìåíò â ñïèñîê"
+msgstr "Âíóòðåííÿÿ îøèáêà: íå óäàëîñü äîáàâèòü ýëåìåíò â ñïèñîê"

-msgid "can only concatenate with lists"
-msgstr "ìîæíî îáúåäèíèòü òîëüêî ñïèñêè"
+msgid "cannot delete vim.List attributes"
+msgstr "Íåâîçìîæíî óäàëèòü àòðèáóòû vim.List"

-msgid "Cannot modify fixed list"
+msgid "cannot modify fixed list"
 msgstr "Íåâîçìîæíî èçìåíèòü ôèêñèðîâàííûé ñïèñîê"

-msgid "'self' argument must be a dictionary"
-msgstr "ïàðàìåòð 'self' äîëæåí áûòü ñëîâàð¸ì"
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "Íå ñóùåñòâóåò áåçûìÿííîé ôóíêöèè %s"

-msgid "failed to run function"
-msgstr "íåâîçìîæíî âûïîëíèòü ôóíêöèþ"
+#, c-format
+msgid "function %s does not exist"
+msgstr "Ôóíêöèÿ %s íå ñóùåñòâóåò"
+
+msgid "function constructor does not accept keyword arguments"
+msgstr "Êîíñòðóêòîð ôóíêöèè íå äîïóñêàåò êëþ÷åâûå ñëîâà êàê àðãóìåíòû"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "Íåâîçìîæíî âûïîëíèòü ôóíêöèþ %s"
+
+msgid "unable to get option value"
+msgstr "Íåâîçìîæíî ïîëó÷èòü çíà÷åíèå îïöèè"
+
+msgid "internal error: unknown option type"
+msgstr "Âíóòðåííÿÿ îøèáêà: íåèçâåñòíûé òèï îïöèè"
+
+msgid "problem while switching windows"
+msgstr "Ïðîáëåìà ïðè ïåðåêëþ÷åíèè îêîí"
+
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "Íåâîçìîæíî ñáðîñèòü ãëîáàëüíóþ îïöèþ %s"
+
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "Íåâîçìîæíî ñáðîñèòü îïöèþ %s áåç ãëîáàëüíîãî çíà÷åíèÿ"
+
+msgid "attempt to refer to deleted tab page"
+msgstr "Ïîïûòêà ñîñëàòüñÿ íà óäàë¸ííóþ âêëàäêó"
+
+msgid "no such tab page"
+msgstr "Íåò òàêîé âêëàäêè"

 msgid "attempt to refer to deleted window"
-msgstr "ïîïûòêà ñîñëàòüñÿ íà çàêðûòîå îêíî"
+msgstr "Ïîïûòêà ñîñëàòüñÿ íà çàêðûòîå îêíî"

-msgid "readonly attribute"
-msgstr "àòðèáóò äîñòóïåí òîëüêî äëÿ ÷òåíèÿ"
+msgid "readonly attribute: buffer"
+msgstr "Àòðèáóò òîëüêî äëÿ ÷òåíèÿ: áóôåð"

 msgid "cursor position outside buffer"
-msgstr "ïîçèöèÿ êóðñîðà íàõîäèòñÿ âíå áóôåðà"
-
-#, c-format
-msgid "<window object (deleted) at %p>"
-msgstr "<îáúåêò îêíà (óäàëåí) â %p>"
-
-#, c-format
-msgid "<window object (unknown) at %p>"
-msgstr "<îáúåêò îêíà (íåèçâåñòåí) â %p>"
-
-#, c-format
-msgid "<window %d>"
-msgstr "<îêíî %d>"
+msgstr "Ïîçèöèÿ êóðñîðà íàõîäèòñÿ âíå áóôåðà"

 msgid "no such window"
-msgstr "íåò òàêîãî îêíà"
+msgstr "Íåò òàêîãî îêíà"

 msgid "attempt to refer to deleted buffer"
-msgstr "ïîïûòêà ñîñëàòüñÿ íà óíè÷òîæåííûé áóôåð"
+msgstr "Ïîïûòêà ñîñëàòüñÿ íà óíè÷òîæåííûé áóôåð"

-msgid "unable to convert to vim structure"
-msgstr "íåâîçìîæíî ïðåîáðàçîâàòü â ñòðóêòóðó VIM"
+msgid "failed to rename buffer"
+msgstr "Íåâîçìîæíî ïåðåèìåíîâàòü áóôåð"

-msgid "NULL reference passed"
-msgstr "ïåðåäàíà ññûëêà íà NULL"
+msgid "mark name must be a single character"
+msgstr "Íàçâàíèå îòìåòêè äîëæíî áûòü îäíèì ñèìâîëîì"
+
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "Îæèäàëñÿ îáúåêò vim.Buffer, íî ïîëó÷åí %s"
+
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "Íåâîçìîæíî ïåðåêëþ÷èòüñÿ íà áóôåð %d"
+
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "Îæèäàëñÿ îáúåêò vim.Window, íî ïîëó÷åí %s"
+
+msgid "failed to find window in the current tab page"
+msgstr "Íåâîçìîæíî íàéòè îêíî â òåêóùåé âêëàäêå"
+
+msgid "did not switch to the specified window"
+msgstr "Íåâîçìîæíî ïåðåêëþ÷èòüñÿ íà óêàçàííîå îêíî"
+
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "Îæèäàëñÿ îáúåêò vim.TabPage, íî ïîëó÷åí %s"
+
+msgid "did not switch to the specified tab page"
+msgstr "Íåâîçìîæíî ïåðåêëþ÷èòüñÿ íà óêàçàííóþ âêëàäêó"
+
+msgid "failed to run the code"
+msgstr "Íåâîçìîæíî âûïîëíèòü êîä"
+
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval íå âîçâðàòèë äîïóñòèìîãî îáúåêòà Python"
+
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr ""
+"E859: Íå óäàëîñü ïðåîáðàçîâàòü âîçâðàù¸ííûé îáúåêò Python â çíà÷åíèå VIM"
+
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "Íåâîçìîæíî ïðåîáðàçîâàòü %s â ñëîâàðü VIM"
+
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "Íåâîçìîæíî ïðåîáðàçîâàòü %s â ñòðóêòóðó VIM"
+
+msgid "internal error: NULL reference passed"
+msgstr "Âíóòðåííÿÿ îøèáêà: ïåðåäàíà ññûëêà íà NULL"

 msgid "internal error: invalid value type"
-msgstr "âíóòðåííÿÿ îøèáêà: íåïðàâèëüíûé òèï çíà÷åíèÿ"
+msgstr "Âíóòðåííÿÿ îøèáêà: íåïðàâèëüíûé òèï çíà÷åíèÿ"
+
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"Îøèáêà ïðè óñòàíîâêå ïåðåõâàò÷èêà ïóòè: sys.path_hooks íå ÿâëÿåòñÿ ñïèñêîì\n"
+"Ñëåäóåò ñäåëàòü ñëåäóþùåå:\n"
+"— Äîáàâèòü vim.path_hook  â sys.path_hooks\n"
+"— Äîáàâèòü vim.VIM_SPECIAL_PATH â sys.path\n"
+
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"Îøèáêà ïðè óñòàíîâêå ïóòè: sys.path íå ÿâëÿåòñÿ ñïèñêîì\n"
+"Ñëåäóåò äîáàâèòü vim.VIM_SPECIAL_PATH â sys.path"
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim_7.3_ru\n"
+"Project-Id-Version: vim_7.4_ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 13:52+0400\n"
-"PO-Revision-Date: 2013-06-01 14:16+0400\n"
+"POT-Creation-Date: 2013-07-08 00:47+0400\n"
+"PO-Revision-Date: 2013-07-08 00:47+0400\n"
 "Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
 "Language-Team: \n"
 "Language: Russian\n"
@@ -423,6 +423,9 @@ msgstr "E130: Неизвестная функция: %s"
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Недопустимое имя переменной: %s"

+msgid "E806: using Float as a String"
+msgstr "E806: Использование числа с плавающей точкой как строки"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: Целей меньше чем элементов списка"

@@ -582,13 +585,13 @@ msgstr "E785: complete() может использоваться только в
 msgid "&Ok"
 msgstr "&Ok"

-msgid "extend() argument"
-msgstr "параметр extend()"
-
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: Ключ уже существует: %s"

+msgid "extend() argument"
+msgstr "параметр extend()"
+
 msgid "map() argument"
 msgstr "параметр map()"

@@ -686,9 +689,6 @@ msgstr "E730: Использование списка как строки"
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Использование словаря как строки"

-msgid "E806: using Float as a String"
-msgstr "E806: Использование числа с плавающей точкой как строки"
-
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: Несоответствие типа переменной для: %s"
@@ -729,6 +729,9 @@ msgstr "E123: Неопределённая функция: %s"
 msgid "E124: Missing '(': %s"
 msgstr "E124: Пропущена '(': %s"

+msgid "E862: Cannot use g: here"
+msgstr "E862: Здесь невозможно использовать g:"
+
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: Недопустимый параметр: %s"
@@ -1000,6 +1003,10 @@ msgstr "E148: В команде :global пропущено регулярное
 msgid "Pattern found in every line: %s"
 msgstr "Соответствие шаблону найдено на каждой строке: %s"

+#, c-format
+msgid "Pattern not found: %s"
+msgstr "Шаблон не найден: %s"
+
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -2261,32 +2268,28 @@ msgid "Font '%s' is not fixed-width"
 msgstr "Шрифт '%s' не является моноширинным"

 #, c-format
-msgid "E253: Fontset name: %s\n"
-msgstr "E253: Набор шрифтов: %s\n"
+msgid "E253: Fontset name: %s"
+msgstr "E253: Набор шрифтов: %s"

 #, c-format
-msgid "Font0: %s\n"
-msgstr "Font0: %s\n"
+msgid "Font0: %s"
+msgstr "Font0: %s"

 #, c-format
-msgid "Font1: %s\n"
-msgstr "Font1: %s\n"
+msgid "Font1: %s"
+msgstr "Font1: %s"

 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "Ширина шрифта font%ld должна быть вдвое больше ширины шрифта font0\n"
+msgid "Font%ld width is not twice that of font0"
+msgstr "Ширина шрифта font%ld должна быть вдвое больше ширины шрифта font0"

 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Ширина шрифта font0: %ld\n"
+msgid "Font0 width: %ld"
+msgstr "Ширина шрифта font0: %ld"

 #, c-format
-msgid ""
-"Font1 width: %ld\n"
-"\n"
-msgstr ""
-"Ширина шрифта font1: %ld\n"
-"\n"
+msgid "Font1 width: %ld"
+msgstr "Ширина шрифта font1: %ld"

 msgid "Invalid font specification"
 msgstr "Неправильное определение шрифта"
@@ -2474,8 +2477,11 @@ msgstr "E566: Невозможно создать трубу для cscope"
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Невозможно выполнить fork() для cscope"

+msgid "cs_create_connection setpgid failed"
+msgstr "cs_create_connection: не удалось выполнить setpgid"
+
 msgid "cs_create_connection exec failed"
-msgstr "не удалось выполнить cs_create_connection"
+msgstr "cs_create_connection: не удалось выполнить exec"

 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: не удалось выполнить fdopen для to_fp"
@@ -2641,9 +2647,6 @@ msgstr "не допускается в песочнице Vim"
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: Данный Vim не может выполнить :python после использования :py3"

-msgid "only string keys are allowed"
-msgstr "допустимы только строковые ключи"
-
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
@@ -2654,27 +2657,9 @@ msgstr ""
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Невозможно выполнить рекурсивный вызов Python"

-msgid "E858: Eval did not return a valid python object"
-msgstr "E858: Eval не возвратил допустимого объекта Python"
-
-msgid "E859: Failed to convert returned python object to vim value"
-msgstr ""
-"E859: Не удалось преобразовать возвращённый объект Python в значение VIM"
-
-#, c-format
-msgid "<buffer object (deleted) at %p>"
-msgstr "<объект буфера (удален) в %p>"
-
 msgid "E837: This Vim cannot execute :py3 after using :python"
 msgstr "E837: Данный Vim не может выполнить :py3 после использования :python"

-msgid "E860: Eval did not return a valid python 3 object"
-msgstr "E860: Eval не возвратил допустимого объекта Python 3"
-
-msgid "E861: Failed to convert returned python 3 object to vim value"
-msgstr ""
-"E861: Не удалось преобразовать возвращённый объект Python 3 в значение VIM"
-
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ должен быть экземпляром или строкой"

@@ -4780,18 +4765,9 @@ msgstr "E777: Требуется строка или список"
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: Недопустимый элемент в %s%%[]"

-msgid "E339: Pattern too long"
-msgstr "E339: Слишком длинный шаблон"
-
-msgid "E50: Too many \\z("
-msgstr "E50: Слишком много \\z("
-
 #, c-format
-msgid "E51: Too many %s("
-msgstr "E51: Слишком много %s("
-
-msgid "E52: Unmatched \\z("
-msgstr "E52: Нет пары для \\z("
+msgid "E769: Missing ] after %s["
+msgstr "E769: Пропущена ] после %s["

 #, c-format
 msgid "E53: Unmatched %s%%("
@@ -4805,6 +4781,33 @@ msgstr "E54: Нет пары для %s("
 msgid "E55: Unmatched %s)"
 msgstr "E55: Нет пары для %s)"

+msgid "E66: \\z( not allowed here"
+msgstr "E66: \\z( не может быть использовано здесь"
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 и т.п. не могут быть использованы здесь"
+
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: Пропущена ] после %s%%["
+
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: Пустое %s%%[]"
+
+msgid "E339: Pattern too long"
+msgstr "E339: Слишком длинный шаблон"
+
+msgid "E50: Too many \\z("
+msgstr "E50: Слишком много \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: Слишком много %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: Нет пары для \\z("
+
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: Недопустимый символ после %s@"
@@ -4831,23 +4834,9 @@ msgstr "E64: %s%c ни за чем не следует"
 msgid "E65: Illegal back reference"
 msgstr "E65: Недопустимая обратная ссылка"

-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( не может быть использовано здесь"
-
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 и т.п. не могут быть использованы здесь"
-
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Недопустимый символ после \\z"

-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: Пропущена ] после %s%%["
-
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: Пустое %s%%[]"
-
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: Недопустимый символ после %s%%[dxouU]"
@@ -4856,10 +4845,6 @@ msgstr "E678: Недопустимый символ после %s%%[dxouU]"
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: Недопустимый символ после %s%%"

-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: Пропущена ] после %s["
-
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Синтаксическая ошибка в %s{...}"
@@ -4867,6 +4852,81 @@ msgstr "E554: Синтаксическая ошибка в %s{...}"
 msgid "External submatches:\n"
 msgstr "Внешние подсоответствия:\n"

+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: после \\%#= может быть только 0, 1 или 2. Будет использоваться "
+"автоматическая машина"
+
+#, c-format
+msgid "E866: (NFA regexp) Misplaced %c"
+msgstr "E866: (рег. выражение НКА) неожиданный %c"
+
+msgid "E865: (NFA) Regexp end encountered prematurely"
+msgstr "E865: (НКА) неожиданный конец регулярного выражения"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\z%c'"
+msgstr "E867: (НКА) неизвестный оператор '\\z%c'"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (НКА) неизвестный оператор '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: ошибка при создании НКА с классом эквивалентности!"
+
+#, c-format
+msgid "E869: (NFA) Unknown operator '\\@%c'"
+msgstr "E869: (НКА) неизвестный оператор '\\@%c'"
+
+msgid "E870: (NFA regexp) Error reading repetition limits"
+msgstr "E870: (рег. выражение НКА) ошибка при чтении границ повторения"
+
+#. Can't have a multi follow a multi.
+msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+msgstr "E871: (рег. выражение НКА) множество не может следовать за множеством!"
+
+#. Too many `('
+msgid "E872: (NFA regexp) Too many '('"
+msgstr "E872: (рег. выражение НКА) слишком много '('"
+
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (рег. выражение НКА) слишком много \\z("
+
+msgid "E873: (NFA regexp) proper termination error"
+msgstr "E873: (рег. выражение НКА) ошибка корректного завершения"
+
+msgid "E874: (NFA) Could not pop the stack !"
+msgstr "E874: (рег. выражение НКА) невозможно взять из стека!"
+
+msgid ""
+"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
+"left on stack"
+msgstr ""
+"E875: (рег. выражение НКА) в стеке осталось слишком много состояний (при "
+"преобразовании из postfix в НКА)"
+
+msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
+msgstr "E876: (рег. выражение НКА) недостаточно места для хранения всего НКА"
+
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (НКА) невозможно выделить память для прохода ветви!"
+
+msgid ""
+"Could not open temporary log file for writing, displaying on stderr ... "
+msgstr ""
+"Невозможно открыть файл временного журнала для записи, вывод на stderr..."
+
+#, c-format
+msgid "(NFA) COULD NOT OPEN %s !"
+msgstr "(НКА) невозможно открыть %s!"
+
+msgid "Could not open temporary log file for writing "
+msgstr "Невозможно открыть файл временного журнала для записи"
+
 msgid " VREPLACE"
 msgstr " ВИРТУАЛЬНАЯ ЗАМЕНА"

@@ -5367,6 +5427,9 @@ msgstr "E782: Ошибка при чтении файла .sug: %s"
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: Повторяющийся символ в элементе MAP"

+msgid "No Syntax items defined for this buffer"
+msgstr "Синтаксические элементы для данного буфера не определены"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Недопустимый параметр: %s"
@@ -5375,9 +5438,6 @@ msgstr "E390: Недопустимый параметр: %s"
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Синтаксический кластер %s не найден"

-msgid "No Syntax items defined for this buffer"
-msgstr "Синтаксические элементы для данного буфера не определены"
-
 msgid "syncing on C-style comments"
 msgstr "Синхронизация по комментариям в стиле языка C"

@@ -5504,6 +5564,11 @@ msgstr "E409: Неизвестная группа: %s"
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Неправильная подкоманда :syntax: %s"

+msgid ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+msgstr ""
+"  ВСЕГО       КОЛ.  СООТВ. ОТСТАЮЩИЙ    СРЕДНИЙ    ИМЯ                ШАБЛОН"
+
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: Рекурсивная петля при загрузке syncolor.vim"

@@ -6573,110 +6638,246 @@ msgstr "Поиск будет продолжен с НАЧАЛА докумен
 msgid "Need encryption key for \"%s\""
 msgstr "Требуется ключ шифрования для \"%s\""

+msgid "empty keys are not allowed"
+msgstr "Пустые ключи не допустимы"
+
+msgid "dictionary is locked"
+msgstr "Словарь заблокирован"
+
+msgid "list is locked"
+msgstr "Список заблокирован"
+
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "Невозможно добавить ключ '%s' к словарю"
+
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "Индекс должен быть целым числом или выборкой, а не %s"
+
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "Ожидался экземпляр str() или unicode(), но получен %s"
+
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "Ожидался экземпляр bytes() или str(), но получен %s"
+
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr "Ожидалось int(), long() или что-то приводимое к long(), но получено %s"
+
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "Ожидалось int() или что-то приводимое к int(), но получено %s"
+
+msgid "value is too large to fit into C int type"
+msgstr "Значение слишком велико для целочисленного типа C"
+
+msgid "value is too small to fit into C int type"
+msgstr "Значение слишком мало для целочисленного типа C"
+
+msgid "number must be greater then zero"
+msgstr "Номер должен быть больше нуля"
+
+msgid "number must be greater or equal to zero"
+msgstr "Номер должен быть больше или равен нулю"
+
 msgid "can't delete OutputObject attributes"
-msgstr "невозможно удалить атрибуты OutputObject"
+msgstr "Невозможно удалить атрибуты OutputObject"

-msgid "softspace must be an integer"
-msgstr "значение softspace должно быть целым числом"
-
-msgid "invalid attribute"
-msgstr "неправильный атрибут"
-
-msgid "writelines() requires list of strings"
-msgstr "writelines() требует указания списка строк"
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "Неправильный атрибут: %s"

 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: Ошибка инициализации объектов I/O"

-msgid "no such buffer"
-msgstr "нет такого буфера"
+msgid "failed to change directory"
+msgstr "Невозможно сменить каталог"

-msgid "empty keys are not allowed"
-msgstr "пустые ключи не допустимы"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "Ожидался 3-кортеж как результат imp.find_module(), но получен %s"

-msgid "failed to add key to dictionary"
-msgstr "невозможно добавить ключ к словарю"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr ""
+"Ожидался 3-кортеж как результат imp.find_module(), но получен кортеж с "
+"размером %d"

-msgid "Cannot delete DictionaryObject attributes"
-msgstr "Невозможно удалить атрибуты DictionaryObject"
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "Внутренняя ошибка: imp.find_module возвратил "

-msgid "Cannot modify fixed dictionary"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "Невозможно удалить атрибуты vim.Dictionary"
+
+msgid "cannot modify fixed dictionary"
 msgstr "Невозможно изменить фиксированный словарь"

-msgid "Only boolean objects are allowed"
-msgstr "Разрешено использовать только логические объекты"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "Невозможно установить атрибут %s"

-msgid "Cannot set this attribute"
-msgstr "Невозможно установить этот атрибут"
+msgid "hashtab changed during iteration"
+msgstr "Хэш-таблица изменилась при итерации"

-msgid "no such key in dictionary"
-msgstr "нет такого ключа в словаре"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr ""
+"Ожидался элемент-последовательность размера 2, а размер полученной "
+"последовательности %d"

-msgid "dict is locked"
-msgstr "словарь заблокирован"
+msgid "list constructor does not accept keyword arguments"
+msgstr "Конструктор списка не допускает ключевые слова как аргументы"

-msgid "internal error: failed to get vim list item"
-msgstr "внутренняя ошибка: не удалось получить элемент списка VIM"
+msgid "list index out of range"
+msgstr "Индекс списка за пределами диапазона"

-msgid "list is locked"
-msgstr "список заблокирован"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "Внутренняя ошибка: не удалось получить элемент VIM-списка %d"

-msgid "Failed to add item to list"
+msgid "failed to add item to list"
 msgstr "Невозможно добавить элемент в список"

-msgid "internal error: no vim list item"
-msgstr "внутренняя ошибка: нет элемента списка VIM"
-
-msgid "can only assign lists to slice"
-msgstr "назначение выборки возможно только для списков"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "Внутренняя ошибка: нет элемента VIM-списка %d"

 msgid "internal error: failed to add item to list"
-msgstr "внутренняя ошибка: не удалось добавить элемент в список"
+msgstr "Внутренняя ошибка: не удалось добавить элемент в список"

-msgid "can only concatenate with lists"
-msgstr "можно объединить только списки"
+msgid "cannot delete vim.List attributes"
+msgstr "Невозможно удалить атрибуты vim.List"

-msgid "Cannot modify fixed list"
+msgid "cannot modify fixed list"
 msgstr "Невозможно изменить фиксированный список"

-msgid "'self' argument must be a dictionary"
-msgstr "параметр 'self' должен быть словарём"
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "Не существует безымянной функции %s"

-msgid "failed to run function"
-msgstr "невозможно выполнить функцию"
+#, c-format
+msgid "function %s does not exist"
+msgstr "Функция %s не существует"
+
+msgid "function constructor does not accept keyword arguments"
+msgstr "Конструктор функции не допускает ключевые слова как аргументы"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "Невозможно выполнить функцию %s"
+
+msgid "unable to get option value"
+msgstr "Невозможно получить значение опции"
+
+msgid "internal error: unknown option type"
+msgstr "Внутренняя ошибка: неизвестный тип опции"
+
+msgid "problem while switching windows"
+msgstr "Проблема при переключении окон"
+
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "Невозможно сбросить глобальную опцию %s"
+
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "Невозможно сбросить опцию %s без глобального значения"
+
+msgid "attempt to refer to deleted tab page"
+msgstr "Попытка сослаться на удалённую вкладку"
+
+msgid "no such tab page"
+msgstr "Нет такой вкладки"

 msgid "attempt to refer to deleted window"
-msgstr "попытка сослаться на закрытое окно"
+msgstr "Попытка сослаться на закрытое окно"

-msgid "readonly attribute"
-msgstr "атрибут доступен только для чтения"
+msgid "readonly attribute: buffer"
+msgstr "Атрибут только для чтения: буфер"

 msgid "cursor position outside buffer"
-msgstr "позиция курсора находится вне буфера"
-
-#, c-format
-msgid "<window object (deleted) at %p>"
-msgstr "<объект окна (удален) в %p>"
-
-#, c-format
-msgid "<window object (unknown) at %p>"
-msgstr "<объект окна (неизвестен) в %p>"
-
-#, c-format
-msgid "<window %d>"
-msgstr "<окно %d>"
+msgstr "Позиция курсора находится вне буфера"

 msgid "no such window"
-msgstr "нет такого окна"
+msgstr "Нет такого окна"

 msgid "attempt to refer to deleted buffer"
-msgstr "попытка сослаться на уничтоженный буфер"
+msgstr "Попытка сослаться на уничтоженный буфер"

-msgid "unable to convert to vim structure"
-msgstr "невозможно преобразовать в структуру VIM"
+msgid "failed to rename buffer"
+msgstr "Невозможно переименовать буфер"

-msgid "NULL reference passed"
-msgstr "передана ссылка на NULL"
+msgid "mark name must be a single character"
+msgstr "Название отметки должно быть одним символом"
+
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "Ожидался объект vim.Buffer, но получен %s"
+
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "Невозможно переключиться на буфер %d"
+
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "Ожидался объект vim.Window, но получен %s"
+
+msgid "failed to find window in the current tab page"
+msgstr "Невозможно найти окно в текущей вкладке"
+
+msgid "did not switch to the specified window"
+msgstr "Невозможно переключиться на указанное окно"
+
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "Ожидался объект vim.TabPage, но получен %s"
+
+msgid "did not switch to the specified tab page"
+msgstr "Невозможно переключиться на указанную вкладку"
+
+msgid "failed to run the code"
+msgstr "Невозможно выполнить код"
+
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval не возвратил допустимого объекта Python"
+
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr ""
+"E859: Не удалось преобразовать возвращённый объект Python в значение VIM"
+
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "Невозможно преобразовать %s в словарь VIM"
+
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "Невозможно преобразовать %s в структуру VIM"
+
+msgid "internal error: NULL reference passed"
+msgstr "Внутренняя ошибка: передана ссылка на NULL"

 msgid "internal error: invalid value type"
-msgstr "внутренняя ошибка: неправильный тип значения"
+msgstr "Внутренняя ошибка: неправильный тип значения"
+
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"Ошибка при установке перехватчика пути: sys.path_hooks не является списком\n"
+"Следует сделать следующее:\n"
+"— Добавить vim.path_hook  в sys.path_hooks\n"
+"— Добавить vim.VIM_SPECIAL_PATH в sys.path\n"
+
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"Ошибка при установке пути: sys.path не является списком\n"
+"Следует добавить vim.VIM_SPECIAL_PATH в sys.path"
@@ -33,7 +33,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
 		test76.out test77.out test78.out test79.out test80.out \
 		test81.out test82.out test83.out test84.out test88.out \
 		test89.out test90.out test91.out test92.out test93.out \
-		test94.out test95.out test96.out test97.out
+		test94.out test95.out test96.out test97.out test98.out

 .SUFFIXES: .in .out

@@ -147,3 +147,4 @@ test94.out: test94.in
 test95.out: test95.in
 test96.out: test96.in
 test97.out: test97.in
+test98.out: test98.in
@@ -32,7 +32,7 @@ SCRIPTS =	test3.out test4.out test5.out test6.out test7.out \
 		test79.out test80.out test81.out test82.out test83.out \
 		test84.out test85.out test86.out test87.out test88.out \
 		test89.out test90.out test91.out test92.out test93.out \
-		test94.out test95.out test96.out
+		test94.out test95.out test96.out test98.out

 SCRIPTS32 =	test50.out test70.out

@@ -52,7 +52,7 @@ SCRIPTS =	test3.out test4.out test5.out test6.out test7.out \
 		test79.out test80.out test81.out test82.out test83.out \
 		test84.out test85.out test86.out test87.out test88.out \
 		test89.out test90.out test91.out test92.out test93.out \
-		test94.out test95.out test96.out
+		test94.out test95.out test96.out test98.out

 SCRIPTS32 =	test50.out test70.out

@@ -34,7 +34,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
 		test76.out test77.out test78.out test79.out test80.out \
 		test81.out test82.out test83.out test84.out test88.out \
 		test89.out test90.out test91.out test92.out test93.out \
-		test94.out test95.out test96.out
+		test94.out test95.out test96.out test98.out

 .SUFFIXES: .in .out

@@ -4,7 +4,7 @@
 # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
 #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
 #
-# Last change:  2013 Jul 03
+# Last change:  2013 Jul 09
 #
 # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
 # Edit the lines in the Configuration section below to select.
@@ -78,7 +78,7 @@ SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.out  \
 	 test77.out test78.out test79.out test80.out test81.out \
 	 test82.out test83.out test84.out test88.out test89.out \
 	 test90.out test91.out test92.out test93.out test94.out \
-	 test95.out test96.out test97.out
+	 test95.out test96.out test97.out test98.out

 # Known problems:
 # Test 30: a problem around mac format - unknown reason
@@ -29,7 +29,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
 		test79.out test80.out test81.out test82.out test83.out \
 		test84.out test85.out test86.out test87.out test88.out \
 		test89.out test90.out test91.out test92.out test93.out \
-		test94.out test95.out test96.out test97.out
+		test94.out test95.out test96.out test97.out test98.out

 SCRIPTS_GUI = test16.out

@@ -0,0 +1,21 @@
+Test for 'scrollbind' causing an unexpected scroll of one of the windows.
+STARTTEST
+:so small.vim
+:source test98a.in
+:let topLineLeft = line('w0')
+:wincmd p
+:let topLineRight = line('w0')
+:setl noscrollbind
+:wincmd p
+:setl noscrollbind
+:q!
+:%del _
+:call setline(1, 'Difference between the top lines (left - right): ' . string(topLineLeft - topLineRight))
+:w! test.out
+:brewind
+ENDTEST
+
+STARTTEST
+:qa!
+ENDTEST
+
@@ -0,0 +1 @@
+Difference between the top lines (left - right): 0
@@ -0,0 +1,27 @@
+" We don't want the status line to cause problems:
+set laststatus=0
+redraw!
+let g:totalLines = &lines * 20
+let middle = g:totalLines / 2
+wincmd n
+wincmd o
+for i in range(1, g:totalLines)
+	call setline(i, 'LINE ' . i)
+endfor
+
+exe string(middle)
+normal zt
+normal M
+
+aboveleft vert new
+for i in range(1, g:totalLines)
+	call setline(i, 'line ' . i)
+endfor
+exe string(middle)
+normal zt
+normal M
+setl scb
+
+wincmd p
+
+call feedkeys(":setl scb\n\<C-w>\<C-w>", 't')
@@ -35,8 +35,6 @@ static char	*mediumVersion = VIM_VERSION_MEDIUM;
 char	longVersion[sizeof(VIM_VERSION_LONG_DATE) + sizeof(__DATE__)
 						      + sizeof(__TIME__) + 3];

-static void list_features __ARGS((void));
-
    void
 make_version()
 {
@@ -57,6 +55,7 @@ char	*longVersion = VIM_VERSION_LONG_DATE __DATE__ " " __TIME__ ")";
 char	*longVersion = VIM_VERSION_LONG;
 #endif

+static void list_features __ARGS((void));
 static void version_msg __ARGS((char *s));

 static char *(features[]) =
@@ -743,6 +742,22 @@ static char *(features[]) =

 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    9,
+/**/
+    8,
+/**/
+    7,
+/**/
+    6,
+/**/
+    5,
+/**/
+    4,
+/**/
+    3,
+/**/
+    2,
 /**/
    1,
 /**/
@@ -91,7 +91,7 @@ BEGIN
 	VALUE "FileDescription",	"Vi Improved - A Text Editor\0"
 	VALUE "FileVersion",		VIM_VERSION_MAJOR_STR ", " VIM_VERSION_MINOR_STR ", " VIM_VERSION_BUILD_STR ", " VIM_VERSION_PATCHLEVEL_STR  "\0"
 	VALUE "InternalName",		"VIM\0"
-	VALUE "LegalCopyright",		"Copyright \251 1996-2008\0"
+	VALUE "LegalCopyright",		"Copyright \251 1996\0"
 	VALUE "LegalTrademarks",	"Vim\0"
 	VALUE "OriginalFilename",	"VIM.EXE\0"
 	VALUE "ProductName",		"Vim\0"
@@ -67,7 +67,7 @@ BEGIN
 	VALUE "FileDescription",	"Vi Improved - A Text Editor\0"
 	VALUE "FileVersion",		VIM_VERSION_MAJOR_STR ", " VIM_VERSION_MINOR_STR ", " VIM_VERSION_BUILD_STR ", " VIM_VERSION_PATCHLEVEL_STR  "\0"
 	VALUE "InternalName",		"VIM\0"
-	VALUE "LegalCopyright",		"Copyright \251 1996-2005\0"
+	VALUE "LegalCopyright",		"Copyright \251 1996\0"
 	VALUE "LegalTrademarks",	"Vim\0"
 	VALUE "OriginalFilename",	"VIM.EXE\0"
 	VALUE "ProductName",		"Vim\0"
Author	SHA1	Message	Date
Bjorn Winckler	af9e2355e3	Snapshot 68	2013-07-12 09:43:09 +02:00
Bjorn Winckler	accd5ef150	Fix drawing of wide glyphs in Core Text renderer	2013-07-10 10:08:07 +02:00
Bjorn Winckler	4537063e73	Merge branch 'vim'	2013-07-09 19:48:32 +02:00
Bjorn Winckler	c708d9448f	Update copyright year	2013-07-09 19:25:35 +02:00
Bram Moolenaar	356a698cca	Added tag v7-4a-009 for changeset 467efeee8f9e	2013-07-09 17:42:46 +02:00
Bram Moolenaar	b45215d062	updated for version 7.4a.009 Problem: Compiler warnings for function prototypes. Solution: Add "void". Move list_features() prototype. (Ken Takata)	2013-07-09 17:42:46 +02:00
Bram Moolenaar	1656d69e02	Added tag v7-4a-008 for changeset b3bd43ef012d	2013-07-09 17:30:55 +02:00
Bram Moolenaar	efe0ed8533	updated for version 7.4a.008 Problem: Python 3 doesn't handle multibyte characters prooperly when 'encoding' is not utf-8. Solution: Use PyUnicode_Decode() instead of PyUnicode_FromString(). (Ken Takata)	2013-07-09 17:30:55 +02:00
Bram Moolenaar	8f9583c178	Added tag v7-4a-007 for changeset c624928fbc49	2013-07-09 17:08:29 +02:00
Bram Moolenaar	99355e8dd8	updated for version 7.4a.007 Problem: After "g$" with 'virtualedit' set, "k" moves to a different column. (Dimitar Dimitrov) Solution: Set w_curswant. (Christian Brabandt)	2013-07-09 17:08:29 +02:00
Bram Moolenaar	b7efedaf35	Updated runtime files. Fix NL translations.	2013-07-09 15:44:17 +02:00
Bram Moolenaar	921d69657b	Added tag v7-4a-006 for changeset 6b6e1786c7df	2013-07-09 14:58:10 +02:00
Bram Moolenaar	982aa4b3d4	updated for version 7.4a.006 Problem: Failure in po file check goes unnoticed. Solution: Fail "make test" if the po file check fails.	2013-07-09 14:58:10 +02:00
Bram Moolenaar	0842e287b1	Added tag v7-4a-005 for changeset 7a6ce0c426fe	2013-07-09 13:44:59 +02:00
Bram Moolenaar	0953e830b2	updated for version 7.4a.005 Problem: Scroll binding causes unexpected scroll. Solution: Store the topline after updating scroll binding. Add a test. (Lech Lorens)	2013-07-09 13:44:59 +02:00
Bram Moolenaar	b830190ddb	Added tag v7-4a-004 for changeset f72d49c406c4	2013-07-09 13:15:46 +02:00
Bram Moolenaar	f930e6fa4b	updated for version 7.4a.004 Problem: MSVC 2012 Update 3 is not recognized. Solution: Add the version number. (Raymond Ko)	2013-07-09 13:15:46 +02:00
Bram Moolenaar	4250f6ca78	Added tag v7-4a-003 for changeset b5abda4e7c4b	2013-07-09 12:54:21 +02:00
Bram Moolenaar	11377cd3aa	updated for version 7.4a.003 Problem: Copyright year is oudated. Solution: Only use the first year.	2013-07-09 12:54:21 +02:00
Bram Moolenaar	0cf5e385dc	Added tag v7-4a-002 for changeset d0288faf3086	2013-07-07 16:15:35 +02:00
Bram Moolenaar	515c68ee4c	updated for version 7.4a.002 Problem: Valgrind errors in test 89. (Simon Ruderich) Solution: Allocate one more byte. (Dominique Pelle)	2013-07-07 16:15:35 +02:00
				`@@ -0,0 +1 @@`
				`Difference between the top lines (left - right): 0`