Updated runtime files.
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 819bb04..ea5a493 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt* For Vim version 7.4. Last change: 2013 Jul 17
+*change.txt* For Vim version 7.4. Last change: 2013 Aug 25
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1126,6 +1126,8 @@
made for the delete operator with these movement commands: |%|, |(|, |)|, |`|,
|/|, |?|, |n|, |N|, |{| and |}|. Register "1 is always used then (this is Vi
compatible). The "- register is used as well if the delete is within a line.
+Note that these character may be mapped. E.g. |%| is mapped by the matchit
+plugin.
With each successive deletion or change, Vim shifts the previous contents
of register 1 into register 2, 2 into 3, and so forth, losing the previous
contents of register 9.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 743aec1..60b01a8 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.4. Last change: 2013 Aug 03
+*eval.txt* For Vim version 7.4. Last change: 2013 Aug 24
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -123,6 +123,7 @@
:echo Fn()
< *E704* *E705* *E707*
A Funcref variable must start with a capital, "s:", "w:", "t:" or "b:". You
+can use "g:" but the following name must still start with a capital. You
cannot have both a Funcref variable and a function with the same name.
A special case is defining a function and directly assigning its Funcref to a
@@ -6337,6 +6338,7 @@
< Note that it's possible for patch 147 to be omitted even though 148 is
included.
+acl Compiled with |ACL| support.
all_builtin_terms Compiled with all builtin terminals enabled.
amiga Amiga version of Vim.
arabic Compiled with Arabic support |Arabic|.
@@ -6503,7 +6505,9 @@
writebackup Compiled with 'writebackup' default on.
xfontset Compiled with X fontset support |xfontset|.
xim Compiled with X input method support |xim|.
-xpm_w32 Compiled with pixmap support for Win32.
+xpm Compiled with pixmap support.
+xpm_w32 Compiled with pixmap support for Win32. (Only for
+ backward compatibility. Use "xpm" instead.)
xsmp Compiled with X session management support.
xsmp_interact Compiled with interactive X session management support.
xterm_clipboard Compiled with support for xterm clipboard.
diff --git a/runtime/doc/if_lua.txt b/runtime/doc/if_lua.txt
index 8d9383c..2b322dd 100644
--- a/runtime/doc/if_lua.txt
+++ b/runtime/doc/if_lua.txt
@@ -1,4 +1,4 @@
-*if_lua.txt* For Vim version 7.4. Last change: 2012 Jun 29
+*if_lua.txt* For Vim version 7.4. Last change: 2013 Sep 04
VIM REFERENCE MANUAL by Luis Carvalho
@@ -135,7 +135,7 @@
<
vim.funcref({name}) Returns a Funcref to function {name} (see
|Funcref|). It is equivalent to Vim's
- "function".
+ "function". NOT IMPLEMENTED YET
vim.buffer([arg]) If "arg" is a number, returns buffer with
number "arg" in the buffer list or, if "arg"
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index de82679..4ae902c 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt* For Vim version 7.4. Last change: 2013 Aug 03
+*map.txt* For Vim version 7.4. Last change: 2013 Aug 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -380,7 +380,7 @@
The simplest way to load a set of related language mappings is by using the
'keymap' option. See |45.5|.
In Insert mode and in Command-line mode the mappings can be disabled with
-the CTRL-^ command |i_CTRL-^| |c_CTRL-^| These commands change the value of
+the CTRL-^ command |i_CTRL-^| |c_CTRL-^|. These commands change the value of
the 'iminsert' option. When starting to enter a normal command line (not a
search pattern) the mappings are disabled until a CTRL-^ is typed. The state
last used is remembered for Insert mode and Search patterns separately. The
@@ -1359,6 +1359,8 @@
In the cases of the -count and -register attributes, if the optional argument
is supplied, it is removed from the argument list and is available to the
replacement text separately.
+Note that these arguments can be abbreviated, but that is a deprecated
+feature. Use the full name for new scripts.
Replacement text
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index fdc5ad2..0688fcc 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.4. Last change: 2013 Jul 09
+*options.txt* For Vim version 7.4. Last change: 2013 Aug 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1884,8 +1884,8 @@
global
{not in Vi}
A sequence of single character flags. When a character is present
- this indicates vi-compatible behavior. This is used for things where
- not being vi-compatible is mostly or sometimes preferred.
+ this indicates Vi-compatible behavior. This is used for things where
+ not being Vi-compatible is mostly or sometimes preferred.
'cpoptions' stands for "compatible-options".
Commas can be added for readability.
To avoid problems with flags that are added in the future, use the
diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt
index 7662fa7..7002e28 100644
--- a/runtime/doc/os_vms.txt
+++ b/runtime/doc/os_vms.txt
@@ -1,4 +1,4 @@
-*os_vms.txt* For Vim version 7.4. Last change: 2011 Aug 14
+*os_vms.txt* For Vim version 7.4. Last change: 2013 Aug 22
VIM REFERENCE MANUAL
@@ -24,7 +24,7 @@
1. Getting started *vms-started*
-Vim (Vi IMproved) is a vi-compatible text editor that runs on nearly every
+Vim (Vi IMproved) is a Vi-compatible text editor that runs on nearly every
operating system known to humanity. Now use Vim on OpenVMS too, in character
or X/Motif environment. It is fully featured and absolutely compatible with
Vim on other operating systems.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 2442f15..3c0c568 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.4. Last change: 2013 Jul 05
+*syntax.txt* For Vim version 7.4. Last change: 2013 Aug 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3156,18 +3156,16 @@
embedded script highlighting they wish to have. >
g:vimsyn_embed == 0 : don't embed any scripts
- g:vimsyn_embed =~ 'm' : embed mzscheme (but only if vim supports it)
- g:vimsyn_embed =~ 'p' : embed perl (but only if vim supports it)
- g:vimsyn_embed =~ 'P' : embed python (but only if vim supports it)
- g:vimsyn_embed =~ 'r' : embed ruby (but only if vim supports it)
- g:vimsyn_embed =~ 't' : embed tcl (but only if vim supports it)
+ g:vimsyn_embed =~ 'm' : support embedded mzscheme
+ g:vimsyn_embed =~ 'p' : support embedded perl
+ g:vimsyn_embed =~ 'P' : support embedded python
+ g:vimsyn_embed =~ 'r' : support embedded ruby
+ g:vimsyn_embed =~ 't' : support embedded tcl
<
-By default, g:vimsyn_embed is "mpPr"; ie. syntax/vim.vim will support
-highlighting mzscheme, perl, python, and ruby by default. Vim's has("tcl")
-test appears to hang vim when tcl is not truly available. Thus, by default,
-tcl is not supported for embedding (but those of you who like tcl embedded in
-their vim syntax highlighting can simply include it in the g:vimembedscript
-option).
+By default, g:vimsyn_embed is a string supporting interpreters that your vim
+itself supports. Concatenate multiple characters to support multiple types
+of embedded interpreters; ie. g:vimsyn_embed= "mp" supports embedded mzscheme
+and embedded perl.
*g:vimsyn_folding*
Some folding is now supported with syntax/vim.vim: >
diff --git a/runtime/doc/tags b/runtime/doc/tags
index b7e16df..f32ea6f 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1140,6 +1140,7 @@
+GUI_Photon various.txt /*+GUI_Photon*
+GUI_neXtaw various.txt /*+GUI_neXtaw*
+X11 various.txt /*+X11*
++acl various.txt /*+acl*
+arabic various.txt /*+arabic*
+autocmd various.txt /*+autocmd*
+balloon_eval various.txt /*+balloon_eval*
@@ -1262,6 +1263,7 @@
+writebackup various.txt /*+writebackup*
+xfontset various.txt /*+xfontset*
+xim various.txt /*+xim*
++xpm various.txt /*+xpm*
+xpm_w32 various.txt /*+xpm_w32*
+xsmp various.txt /*+xsmp*
+xsmp_interact various.txt /*+xsmp_interact*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 5c68352..9ce30c3 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.4. Last change: 2013 Aug 10
+*todo.txt* For Vim version 7.4. Last change: 2013 Sep 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -34,9 +34,48 @@
*known-bugs*
-------------------- Known bugs and current work -----------------------
+NFA engine mismatch, with example. (ZyX, 2013 Aug 29)
+
+php syntax file update. (Jason Woofenden, Aug 30)
+
+Problem positioning the cursor after auto-formatting without a comment. (Tor
+Perkins, 2013 Sep 1)
+
+Popup menu: first item is not selected when typing more than one character?
+
+Patch to add async functionality. (Geoff Greer, 2013 Sep 1)
+
+Patch to avoid mouse cursor flickering. (Ken Takata,, 2013 Sep 2)
+
+Should win_redr_custom() not be allowed to use recursively?
+(Yasuhiro Matsumoto, 2013 Aug 15)
+
+NFA engine combining character mismatch. (glts, 2013 Aug 27)
+Remark Dominique, Aug 27
+
+Issue 164: freeze on regexp search.
+
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 fix substitute prompt with line number. (Benoit Pierre, 2013 Aug 27,
+third message)
+
+Patch to avoid problem with colon in file name. (Yasuhiro Matsumoto, 2013 Sep
+5) Only copy file name when needed.
+
+Include systemverilog file? Two votes yes.
+
+Wrapping around end of file does not work for "." after "cgn". (Dimitar
+Dimitrov)
+Patch by Christian Brabandt, 2013 Aug 22
+
+Problem with 'spellsuggest' file, only works for some words.
+(Cesar Romani, 2013 Aug 20) Depends on file name? (Aug 24)
+Additional remark by glts: the suggested words are marked bad?
+
+Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21)
+
+Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19)
Patch to make has() check for Vim version and patch at the same time.
(Marc Weber, 2013 Jun 7)
@@ -46,13 +85,22 @@
Go through more coverity reports.
-"gUgn" cannot be repeated, while "dgn" can.
+With "$" in 'cpoptions' the popup menu isn't fully drawn. (Matti Niemenmaa,
+2013 Sep 5)
+
+"gUgn" cannot be repeated, while "dgn" can. (Dimitar Dimitrov)
+Patch by Christian Brabandt (2013 Aug 12)
Several Win32 functions are not using Unicode.
Patches to fix this. (Ken Takata, 2013 Aug 9)
/[b-a] gives error E16, should probably be E769.
+:help gives example for z?, but it does not work. m? and t? do work.
+
+Patch to add funcref to Lua. (Luis Carvalho, 2013 Sep 4)
+Missing tests.
+
Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
Patch to make external commands work with multi-byte characters on Win32 when
@@ -85,7 +133,7 @@
Win32: When a directory name contains an exclamation mark, completion doesn't
complete the contents of the directory. No escaping for the "!"? (Jan
-Stocker, 2012 Jan 5)
+Stocker, 2012 Jan 5; 2013 Aug 20)
Patch to support expression argument to sort() instead of a function name.
Yasuhiro Matsumoto, 2013 May 31.
@@ -94,6 +142,10 @@
Problem caused by patch 7.3.638: window->open does not update window
correctly. Issue 91.
+8 'backupdir' and 'directory' should use $TMPDIR, $TMP and/or $TEMP when
+ defined.
+Issue 28.
+
Patch to fix that 'cedit' is recognized after :normal. (Christian Brabandt,
2013 Mar 19, later message)
@@ -108,6 +160,8 @@
Bug with 'cursorline' in diff mode. Line being scrolled into view gets
highlighted as the cursor line. (Alessandro Ivaldi, 2013 Jun 4)
+Two highlighting bugs. (Zyx, 2013 Aug 18)
+
Patch to add the bufferlist() function. (Yegappan Lakshmanan, 2013 May 5)
May 17: with winlist() and tabpagelist().
May 19: with local variables.
@@ -119,6 +173,8 @@
Patch from Christian Brabandt to make the "buffer" argument for ":sign place"
optional. (2013 Jul 12)
+Dialog is too big on Linux too. (David Fishburn, 2013 Sep 2)
+
Patch to allow setting w:quickfix_title via setqflist() and setloclist()
functions. (Christian Brabandt, 2013 May 8, update May 21)
Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14)
@@ -126,6 +182,9 @@
Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
+TCL: With MSVC 2010 doesn't find Tcl_FindExecutable. (tux)
+Patch to define it. (Ken Takata, 2013 Aug 12) Is this right?
+
MS-Windows: Patch to make tests copy files to avoid changing the fileformat of
the files under version control. (Taro Muraoka, 2013 Jul 5)
@@ -167,8 +226,17 @@
Patch to add functions for signs. (Christian Brabandt, 2013 Jan 27)
+Do we need some way (option) to show the sign column even when there are no
+signs? Patch by Christian Brabandt, 2013 Aug 22.
+
+Patch to remove flicker from popup menu. (Yasuhiro Matsumoto, 2013 Aug 15)
+
Patch to use directX to draw text on Windows. Adds the 'renderoptions'
option. (Taro Muraoka, 2013 Jan 25, update 2013 Apr 3, May 14)
+Fixes this problem:
+8 Win32: Multi-byte characters are not displayed, even though the same font
+ in Notepad can display them. (Srinath Avadhanula) Try with the
+ UTF-8-demo.txt page with Andale Mono.
Patch to add 'completeselect' option. Specifies how to select a candidate in
insert completion. (Shougo, 2013 May 29)
@@ -272,6 +340,9 @@
Patch to list user digraphs. (Christian Brabandt, 2012 Apr 14)
+Patch to add digraph() function. (Christian Brabandt, 2013 Aug 22, update Aug
+24)
+
Patch for input method status. (Hirohito Higashi, 2012 Apr 18)
Patch to use .png icons for the toolbar on MS-Windows. (Martin Gieseking, 2013
@@ -396,7 +467,7 @@
Changes to manpage plugin. (Elias Toivanen, 2011 Jul 25)
Patch to make "z=" work when 'spell' is off. Does this have nasty side
-effects? (Christian Brabandt, 2012 Aug 5)
+effects? (Christian Brabandt, 2012 Aug 5, Update 2013 Aug 12)
Would also need to do this for spellbadword() and spellsuggest().
Patch for variable tabstops.
@@ -456,6 +527,9 @@
number, but it is in the sign column. Doesn't look right. (ZyX 2011 Jun 5)
Patch by Christian Brabandt, 2011 Jun 5. Introduces new problems.
+Add jump() function. (Marcin Szamotulski, 2013 Aug 29)
+Is this needed? CTRL-O and CTRL-I do the same, just more difficult to use.
+
8 Add a command to jump to the next character highlighted with "Error".
Patch by Christian Brabandt, uses ]e [e ]t and [t. 2011 Aug 9.
@@ -573,8 +647,7 @@
getpos()/setpos() don't include curswant. getpos() could return a fifth
element. setpos() could accept an optional fifth element.
-Patch by Christian Brabandt, 2010 Sep 6. Check that new argument is optional
-and that it's documented.
+Patch by Christian Brabandt, 2010 Sep 6. Again 2013 Aug 22.
With "tw=55 fo+=a" typing space before ) doesn't work well. (Scott Mcdermott,
2010 Oct 24)
@@ -759,6 +832,7 @@
Patch to add farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
Added test, updates, June 23.
+Updated for 7.4: http://litcave.rudi.ir/farsi_vim.diff
Patch to add "focusonly" to 'scrollopt', so that scrollbind also applies in
window that doesn't have focus. (Jonathon Mah, 2009 Jan 12)
@@ -1685,7 +1759,7 @@
- testdir/Make_dos_sh.mak for running tests with MingW. (Bill Mccarthy, 2008
Sep 13)
- Patch for adding "space" item in 'listchars'. (Jérémie Roquet, 2009 Oct 29,
- Docs patch Oct 30)
+ Docs patch Oct 30, update David Burgin (glts) 2013 Aug 24)
- Replace ccomplete.vim by cppcomplete.vim from www.vim.org? script 1520 by
Vissale Neang. (Martin Stubenschrott) Asked Vissale to make the scripts
more friendly for the Vim distribution.
@@ -1887,9 +1961,6 @@
8 Use another default for 'termencoding': the active codepage. Means that
when 'encoding' is changed typing characters still works properly.
Alternative: use the Unicode functions to obtain typed characters.
-8 Win32: Multi-byte characters are not displayed, even though the same font
- in Notepad can display them. (Srinath Avadhanula) Try with the
- UTF-8-demo.txt page with Andale Mono.
7 The cursor color indicating IME mode doesn't work properly. (Shizhu Pan,
2004 May 9)
8 Win32: When clicking on the gvim title bar, which gives it focus, produces
@@ -2272,8 +2343,6 @@
character. (Yasuhiro Matsumoto) It should return 1 when used on a tail
byte, like for utf-8. Store second byte of double-byte in ScreenLines2[]
(like for DBCS_JPNU) and put a zero in the second byte (like for UTF-8).
-8 'backupdir' and 'directory' should use $TMPDIR, $TMP and/or $TEMP when
- defined.
7 Inside a function with "perl <<EOF" a line with "$i++" is recognized as an
":insert" command, causing the following "endfunction" not to be found.
Add skipping this perl construction inside function definitions.
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index f1990c9..2589a15 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -1,4 +1,4 @@
-*undo.txt* For Vim version 7.4. Last change: 2012 Mar 04
+*undo.txt* For Vim version 7.4. Last change: 2013 Aug 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -57,7 +57,7 @@
2. Two ways of undo *undo-two-ways*
How undo and redo commands work depends on the 'u' flag in 'cpoptions'.
-There is the Vim way ('u' excluded) and the vi-compatible way ('u' included).
+There is the Vim way ('u' excluded) and the Vi-compatible way ('u' included).
In the Vim way, "uu" undoes two changes. In the Vi-compatible way, "uu" does
nothing (undoes an undo).
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 1d05e1a..4a1c64a 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -291,6 +291,7 @@
in the normal, big and huge versions of Vim.
*+feature-list*
+ *+acl* |ACL| support included
*+ARP* Amiga only: ARP support included
B *+arabic* |Arabic| language support
N *+autocmd* |:autocmd|, automatic commands
@@ -426,6 +427,7 @@
m *+writebackup* |'writebackup'| is default on
m *+xim* X input method |xim|
*+xfontset* X fontset support |xfontset|
+ *+xpm* pixmap support
m *+xpm_w32* Win32 GUI only: pixmap support |w32-xpm-support|
*+xsmp* XSMP (X session management) support
*+xsmp_interact* interactive XSMP (X session management) support
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 4780976..4cf2e97 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.4. Last change: 2013 Aug 10
+*version7.txt* For Vim version 7.4. Last change: 2013 Sep 03
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -10293,7 +10293,7 @@
Added special |expand()| argument that expands to the current line
number.
- Made it possible to force |char2nr()| always give unicode codepoints
+ Made it possible to force |char2nr()| to always give unicode codepoints
regardless of current encoding. (Yasuhiro Matsumoto)
Made it possible for functions generating file list generate |List|
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index f35cc02..45fe7de 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt* For Vim version 7.4. Last change: 2012 Aug 08
+*vi_diff.txt* For Vim version 7.4. Last change: 2013 Aug 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -150,7 +150,7 @@
Multi level undo. |undo|
'u' goes backward in time, 'CTRL-R' goes forward again. Set option
'undolevels' to the number of changes to be remembered (default 1000).
- Set 'undolevels' to 0 for a vi-compatible one level undo. Set it to
+ Set 'undolevels' to 0 for a Vi-compatible one level undo. Set it to
-1 for no undo at all.
When all changes in a buffer have been undone, the buffer is not
considered changed anymore. You can exit it with :q, without <!>.
diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
index 807c78b..27f7ff1 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 Jul 07
+" Last Change: 2013 Sep 05
" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
@@ -44,7 +44,7 @@
syn match helpVim "VIM REFERENCE.*"
syn match helpOption "'[a-z]\{2,\}'"
syn match helpOption "'t_..'"
-syn match helpCommand "`[^` ]\+`"hs=s+1,he=e-1 contains=helpBacktick
+syn match helpCommand "`[^` \t]\+`"hs=s+1,he=e-1 contains=helpBacktick
syn match helpHeader "\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore
syn match helpGraphic ".* \ze`$" nextgroup=helpIgnore
if has("conceal")
diff --git a/runtime/syntax/mail.vim b/runtime/syntax/mail.vim
index 823c6b4..0cd48fc 100644
--- a/runtime/syntax/mail.vim
+++ b/runtime/syntax/mail.vim
@@ -2,7 +2,7 @@
" Language: Mail file
" Previous Maintainer: Felix von Leitner <leitner@math.fu-berlin.de>
" Maintainer: GI <a@b.c>, where a='gi1242+vim', b='gmail', c='com'
-" Last Change: Thu 02 Feb 2012 08:47:04 PM EST
+" Last Change: Wed 14 Aug 2013 08:24:52 AM PDT
" Quit when a syntax file was already loaded
if exists("b:current_syntax")
@@ -55,7 +55,7 @@
" Treat verbatim Text special.
syn region mailVerbatim contains=@NoSpell keepend start="^#v+$" end="^#v-$" fold
-syn region mailVerbatim contains=@mailQuoteExps,@NoSpell start="^\z(\(> \?\)\+\)#v+$" end="\z1#v-$" fold
+syn region mailVerbatim contains=@mailQuoteExps,@NoSpell keepend start="^\z(\(> \?\)\+\)#v+$" end="\z1#v-$" fold
" URLs start with a known protocol or www,web,w3.
syn match mailURL contains=@NoSpell `\v<(((https?|ftp|gopher)://|(mailto|file|news):)[^' <>"]+|(www|web|w3)[a-z0-9_-]*\.[a-z0-9._-]+\.[^' <>"]+)[a-z0-9/]`
diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim
index ac3b20c..f27d923 100644
--- a/runtime/syntax/php.vim
+++ b/runtime/syntax/php.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: php PHP 3/4/5
" Maintainer: Jason Woofenden <jason@jasonwoof.com>
-" Last Change: Dec 11, 2012
+" Last Change: Aug 28, 2013
" URL: https://gitorious.org/jasonwoof/vim-syntax/blobs/master/php.vim
" Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
" Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -616,6 +616,11 @@
exec "syn sync fromstart"
endif
+syntax match phpDocCustomTags "@[a-zA-Z]*\(\s\+\|\n\|\r\)" containedin=phpComment
+syntax region phpDocTags start="{@\(example\|id\|internal\|inheritdoc\|link\|source\|toc\|tutorial\)" end="}" containedin=phpComment
+syntax match phpDocTags "@\(abstract\|access\|author\|category\|copyright\|deprecated\|example\|final\|global\|ignore\|internal\|license\|link\|method\|name\|package\|param\|property\|return\|see\|since\|static\|staticvar\|subpackage\|tutorial\|uses\|var\|version\|contributor\|modified\|filename\|description\|filesource\|throws\)\(\s\+\)\?" containedin=phpComment
+syntax match phpDocTodo "@\(todo\|fixme\|xxx\)\(\s\+\)\?" containedin=phpComment
+
" Define the default highlighting.
" For version 5.7 and earlier: only when not done already
" For version 5.8 and later: only when an item doesn't have highlighting yet
@@ -630,6 +635,8 @@
HiLink phpConstant Constant
HiLink phpCoreConstant Constant
HiLink phpComment Comment
+ HiLink phpDocTags PreProc
+ HiLink phpDocCustomTags Type
HiLink phpException Exception
HiLink phpBoolean Boolean
HiLink phpStorageClass StorageClass
@@ -668,6 +675,7 @@
HiLink phpInterpSimpleCurly Delimiter
HiLink phpInterpVarname Identifier
HiLink phpTodo Todo
+ HiLink phpDocTodo Todo
HiLink phpMemberSelector Structure
if exists("php_oldStyle")
hi phpIntVar guifg=Red ctermfg=DarkRed
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index b3914e7..3a82c21 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,8 @@
" Vim syntax file
-" Language: Vim 7.3 script
-" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change: Jul 05, 2013
-" Version: 7.3-26
+" Language: Vim 7.4 script
+" Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
+" Last Change: Aug 16, 2013
+" Version: 7.4-1
" Automatically generated keyword lists: {{{1
" Quit when a syntax file was already loaded {{{2
@@ -550,15 +550,31 @@
" Allows users to specify the type of embedded script highlighting
" they want: (perl/python/ruby/tcl support)
" g:vimsyn_embed == 0 : don't embed any scripts
-" g:vimsyn_embed ~= 'l' : embed lua (but only if vim supports it)
-" g:vimsyn_embed ~= 'm' : embed mzscheme (but only if vim supports it)
-" g:vimsyn_embed ~= 'p' : embed perl (but only if vim supports it)
-" g:vimsyn_embed ~= 'P' : embed python (but only if vim supports it)
-" g:vimsyn_embed ~= 'r' : embed ruby (but only if vim supports it)
-" g:vimsyn_embed ~= 't' : embed tcl (but only if vim supports it)
-if !exists("g:vimsyn_embed")
- let g:vimsyn_embed= "lmpPr"
+" g:vimsyn_embed ~= 'l' : embed lua
+" g:vimsyn_embed ~= 'm' : embed mzscheme
+" g:vimsyn_embed ~= 'p' : embed perl
+" g:vimsyn_embed ~= 'P' : embed python
+" g:vimsyn_embed ~= 'r' : embed ruby
+" g:vimsyn_embed ~= 't' : embed tcl
+if has("win32") || has("win95") || has("win64") || has("win16")
+ " apparently has("tcl") has been hanging vim on some windows systems with cygwin
+ let s:trytcl= (&shell !~ '\<\%(bash\>\|4[nN][tT]\|\<zsh\)\>\%(\.exe\)\=$')
+else
+ let s:trytcl= 1
endif
+if !exists("g:vimsyn_embed")
+ let g:vimsyn_embed= ""
+ if has("lua") |let g:vimsyn_embed= g:vimsyn_embed."l"|endif
+ if has("mzscheme") |let g:vimsyn_embed= g:vimsyn_embed."m"|endif
+ if has("perl") |let g:vimsyn_embed= g:vimsyn_embed."p"|endif
+ if has("python") |let g:vimsyn_embed= g:vimsyn_embed."P"
+ elseif has("python3")|let g:vimsyn_embed= g:vimsyn_embed."P"|endif
+ if has("ruby") |let g:vimsyn_embed= g:vimsyn_embed."r"|endif
+ if s:trytcl
+ if has("tcl") |let g:vimsyn_embed= g:vimsyn_embed."t"|endif
+ endif
+endif
+unlet s:trytcl
" [-- lua --] {{{3
let s:luapath= fnameescape(expand("<sfile>:p:h")."/lua.vim")
@@ -570,7 +586,7 @@
endif
endfor
endif
-if (g:vimsyn_embed =~ 'l' && has("lua")) && filereadable(s:luapath)
+if (g:vimsyn_embed =~ 'l') && filereadable(s:luapath)
unlet! b:current_syntax
exe "syn include @vimLuaScript ".s:luapath
if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'l'
@@ -597,7 +613,7 @@
endif
endfor
endif
-if (g:vimsyn_embed =~ 'p' && has("perl")) && filereadable(s:perlpath)
+if (g:vimsyn_embed =~ 'p') && filereadable(s:perlpath)
unlet! b:current_syntax
exe "syn include @vimPerlScript ".s:perlpath
if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'p'
@@ -624,7 +640,7 @@
endif
endfor
endif
-if (g:vimsyn_embed =~ 'r' && has("ruby")) && filereadable(s:rubypath)
+if (g:vimsyn_embed =~ 'r') && filereadable(s:rubypath)
unlet! b:current_syntax
exe "syn include @vimRubyScript ".s:rubypath
if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'r'
@@ -650,7 +666,7 @@
endif
endfor
endif
-if g:vimsyn_embed =~ 'P' && (has("python") || has("python3")) && filereadable(s:pythonpath)
+if g:vimsyn_embed =~ 'P' && filereadable(s:pythonpath)
unlet! b:current_syntax
exe "syn include @vimPythonScript ".s:pythonpath
if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'P'
@@ -668,43 +684,31 @@
unlet s:pythonpath
" [-- tcl --] {{{3
-if has("win32") || has("win95") || has("win64") || has("win16")
- " apparently has("tcl") has been hanging vim on some windows systems with cygwin
- let s:trytcl= (&shell !~ '\<\%(bash\>\|4[nN][tT]\|\<zsh\)\>\%(\.exe\)\=$')
-else
- let s:trytcl= 1
-endif
-if s:trytcl
- let s:tclpath= fnameescape(expand("<sfile>:p:h")."/tcl.vim")
- if !filereadable(s:tclpath)
- for s:tclpath in split(globpath(&rtp,"syntax/tcl.vim"),"\n")
- if filereadable(fnameescape(s:tclpath))
- let s:tclpath= fnameescape(s:tclpath)
- break
- endif
- endfor
- endif
- if (g:vimsyn_embed =~ 't' && has("tcl")) && filereadable(s:tclpath)
- unlet! b:current_syntax
- exe "syn include @vimTclScript ".s:tclpath
- if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 't'
- syn region vimTclRegion fold matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimTclScript
- syn region vimTclRegion fold matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*$+ end=+\.$+ contains=@vimTclScript
- else
- syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimTclScript
- syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*$+ end=+\.$+ contains=@vimTclScript
+let s:tclpath= fnameescape(expand("<sfile>:p:h")."/tcl.vim")
+if !filereadable(s:tclpath)
+ for s:tclpath in split(globpath(&rtp,"syntax/tcl.vim"),"\n")
+ if filereadable(fnameescape(s:tclpath))
+ let s:tclpath= fnameescape(s:tclpath)
+ break
endif
- syn cluster vimFuncBodyList add=vimTclScript
+ endfor
+endif
+if (g:vimsyn_embed =~ 't') && filereadable(s:tclpath)
+ unlet! b:current_syntax
+ exe "syn include @vimTclScript ".s:tclpath
+ if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 't'
+ syn region vimTclRegion fold matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimTclScript
+ syn region vimTclRegion fold matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*$+ end=+\.$+ contains=@vimTclScript
else
- syn region vimEmbedError start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
- syn region vimEmbedError start=+tc[l]\=\s*<<\s*$+ end=+\.$+
+ syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+ contains=@vimTclScript
+ syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*$+ end=+\.$+ contains=@vimTclScript
endif
- unlet s:tclpath
+ syn cluster vimFuncBodyList add=vimTclScript
else
syn region vimEmbedError start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
syn region vimEmbedError start=+tc[l]\=\s*<<\s*$+ end=+\.$+
endif
-unlet s:trytcl
+unlet s:tclpath
" [-- mzscheme --] {{{3
let s:mzschemepath= fnameescape(expand("<sfile>:p:h")."/scheme.vim")
diff --git a/runtime/syntax/yaml.vim b/runtime/syntax/yaml.vim
index 1e54aff..073dbf7 100644
--- a/runtime/syntax/yaml.vim
+++ b/runtime/syntax/yaml.vim
@@ -108,9 +108,10 @@
syn match yamlFlowMappingMerge /<<\ze\s*:/ contained nextgroup=yamlKeyValueDelimiter
syn match yamlBlockCollectionItemStart '^\s*\zs-\%(\s\+-\)*\s' nextgroup=yamlBlockMappingKey,yamlBlockMappingMerge
-execute 'syn match yamlBlockMappingKey /^\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ '.
+" Use the old regexp engine, the NFA engine doesn't like all the \@ items.
+execute 'syn match yamlBlockMappingKey /\%#=1^\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ '.
\'nextgroup=yamlKeyValueDelimiter'
-execute 'syn match yamlBlockMappingKey /\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ contained '.
+execute 'syn match yamlBlockMappingKey /\%#=1\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ contained '.
\'nextgroup=yamlKeyValueDelimiter'
syn match yamlBlockMappingMerge /^\s*\zs<<\ze:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter
syn match yamlBlockMappingMerge /<<\ze\s*:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter contained
diff --git a/runtime/tutor/tutor.es b/runtime/tutor/tutor.es
index bfb42e4..7bd0c54 100644
--- a/runtime/tutor/tutor.es
+++ b/runtime/tutor/tutor.es
@@ -121,7 +121,7 @@
h (izquierda) j (abajo) k (arriba) l (derecha)
2. Para acceder a Vim (desde el símbolo del sistema %) escriba:
- vin FILENAME <INTRO>
+ vim FILENAME <INTRO>
3. Para salir de Vim escriba: <ESC> :q! <INTRO> para eliminar todos
los cambios.
diff --git a/src/po/ru.cp1251.po b/src/po/ru.cp1251.po
index 72478d8..e35ebe0 100644
--- a/src/po/ru.cp1251.po
+++ b/src/po/ru.cp1251.po
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: vim_7.4_ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-08 00:47+0400\n"
-"PO-Revision-Date: 2013-07-08 00:47+0400\n"
+"POT-Creation-Date: 2013-08-31 16:42+0400\n"
+"PO-Revision-Date: 2013-08-31 21:11+0400\n"
"Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
"Language-Team: \n"
"Language: Russian\n"
@@ -568,8 +568,9 @@
msgid "E808: Number or Float required"
msgstr "E808: Òðåáóåòñÿ öåëîå ÷èñëî èëè ñ ïëàâàþùåé òî÷êîé"
+#. Èñïîëüçóåòñÿ äëÿ ïîëó÷åíèÿ "çíà÷åíèå ïàðàìåòðà p()" â E741 è E742
msgid "add() argument"
-msgstr "ïàðàìåòð add()"
+msgstr "ïàðàìåòðà add()"
msgid "E699: Too many arguments"
msgstr "E699: Ñëèøêîì ìíîãî ïàðàìåòðîâ"
@@ -589,14 +590,17 @@
msgid "E737: Key already exists: %s"
msgstr "E737: Êëþ÷ óæå ñóùåñòâóåò: %s"
+#. Èñïîëüçóåòñÿ äëÿ ïîëó÷åíèÿ "çíà÷åíèå ïàðàìåòðà p()" â E741 è E742
msgid "extend() argument"
-msgstr "ïàðàìåòð extend()"
+msgstr "ïàðàìåòðà extend()"
+#. Èñïîëüçóåòñÿ äëÿ ïîëó÷åíèÿ "çíà÷åíèå ïàðàìåòðà p()" â E741 è E742
msgid "map() argument"
-msgstr "ïàðàìåòð map()"
+msgstr "ïàðàìåòðà map()"
+#. Èñïîëüçóåòñÿ äëÿ ïîëó÷åíèÿ "çíà÷åíèå ïàðàìåòðà p()" â E741 è E742
msgid "filter() argument"
-msgstr "ïàðàìåòð filter()"
+msgstr "ïàðàìåòðà filter()"
#, c-format
msgid "+-%s%3ld lines: "
@@ -616,8 +620,9 @@
msgid "called inputrestore() more often than inputsave()"
msgstr "Ôóíêöèÿ inputrestore() âûçûâàåòñÿ ÷àùå, ÷åì ôóíêöèÿ inputsave()"
+#. Èñïîëüçóåòñÿ äëÿ ïîëó÷åíèÿ "çíà÷åíèå ïàðàìåòðà p()" â E741 è E742
msgid "insert() argument"
-msgstr "ïàðàìåòð insert()"
+msgstr "ïàðàìåòðà insert()"
msgid "E786: Range not allowed"
msgstr "E786: Äèàïàçîí íå äîïóñêàåòñÿ"
@@ -644,20 +649,23 @@
msgid "E277: Unable to read a server reply"
msgstr "E277: Ñåðâåð íå îòâå÷àåò"
+#. Èñïîëüçóåòñÿ äëÿ ïîëó÷åíèÿ "çíà÷åíèå ïàðàìåòðà p()" â E741 è E742
msgid "remove() argument"
-msgstr "ïàðàìåòð remove()"
+msgstr "ïàðàìåòðà remove()"
msgid "E655: Too many symbolic links (cycle?)"
msgstr "E655: Ñëèøêîì ìíîãî ñèìâîëè÷åñêèõ ññûëîê (öèêë?)"
+#. Èñïîëüçóåòñÿ äëÿ ïîëó÷åíèÿ "çíà÷åíèå ïàðàìåòðà p()" â E741 è E742
msgid "reverse() argument"
-msgstr "ïàðàìåòð reverse()"
+msgstr "ïàðàìåòðà reverse()"
msgid "E258: Unable to send to client"
msgstr "E258: Íå ìîãó îòâåòèòü êëèåíòó"
+#. Èñïîëüçóåòñÿ äëÿ ïîëó÷åíèÿ "çíà÷åíèå ïàðàìåòðà p()" â E741 è E742
msgid "sort() argument"
-msgstr "ïàðàìåòð sort()"
+msgstr "ïàðàìåòðà sort()"
msgid "E702: Sort compare function failed"
msgstr "E702: Íåóäà÷íîå çàâåðøåíèå ôóíêöèè ñðàâíåíèÿ ïðè ñîðòèðîâêå"
@@ -707,13 +715,15 @@
msgid "E705: Variable name conflicts with existing function: %s"
msgstr "E705: Èìÿ ïåðåìåííîé êîíôëèêòóåò ñ ñóùåñòâóþùåé ôóíêöèåé: %s"
+#. Èñïîëüçóåòñÿ ñ %s = "ïàðàìåòåðà p"
#, c-format
msgid "E741: Value is locked: %s"
-msgstr "E741: Çíà÷åíèå çàáëîêèðîâàíî: %s"
+msgstr "E741: Çíà÷åíèå %s çàáëîêèðîâàíî"
msgid "Unknown"
msgstr "Íåèçâåñòíî"
+#. Èñïîëüçóåòñÿ ñ %s = "ïàðàìåòåðà p()"
#, c-format
msgid "E742: Cannot change value of %s"
msgstr "E742: Íåâîçìîæíî èçìåíèòü çíà÷åíèå %s"
diff --git a/src/po/ru.po b/src/po/ru.po
index 3f99a47..1a43381 100644
--- a/src/po/ru.po
+++ b/src/po/ru.po
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: vim_7.4_ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-08 00:47+0400\n"
-"PO-Revision-Date: 2013-07-08 00:47+0400\n"
+"POT-Creation-Date: 2013-08-31 16:42+0400\n"
+"PO-Revision-Date: 2013-08-31 21:11+0400\n"
"Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
"Language-Team: \n"
"Language: Russian\n"
@@ -568,8 +568,9 @@
msgid "E808: Number or Float required"
msgstr "E808: Требуется целое число или с плавающей точкой"
+#. Используется для получения "значение параметра p()" в E741 и E742
msgid "add() argument"
-msgstr "параметр add()"
+msgstr "параметра add()"
msgid "E699: Too many arguments"
msgstr "E699: Слишком много параметров"
@@ -589,14 +590,17 @@
msgid "E737: Key already exists: %s"
msgstr "E737: Ключ уже существует: %s"
+#. Используется для получения "значение параметра p()" в E741 и E742
msgid "extend() argument"
-msgstr "параметр extend()"
+msgstr "параметра extend()"
+#. Используется для получения "значение параметра p()" в E741 и E742
msgid "map() argument"
-msgstr "параметр map()"
+msgstr "параметра map()"
+#. Используется для получения "значение параметра p()" в E741 и E742
msgid "filter() argument"
-msgstr "параметр filter()"
+msgstr "параметра filter()"
#, c-format
msgid "+-%s%3ld lines: "
@@ -616,8 +620,9 @@
msgid "called inputrestore() more often than inputsave()"
msgstr "Функция inputrestore() вызывается чаще, чем функция inputsave()"
+#. Используется для получения "значение параметра p()" в E741 и E742
msgid "insert() argument"
-msgstr "параметр insert()"
+msgstr "параметра insert()"
msgid "E786: Range not allowed"
msgstr "E786: Диапазон не допускается"
@@ -644,20 +649,23 @@
msgid "E277: Unable to read a server reply"
msgstr "E277: Сервер не отвечает"
+#. Используется для получения "значение параметра p()" в E741 и E742
msgid "remove() argument"
-msgstr "параметр remove()"
+msgstr "параметра remove()"
msgid "E655: Too many symbolic links (cycle?)"
msgstr "E655: Слишком много символических ссылок (цикл?)"
+#. Используется для получения "значение параметра p()" в E741 и E742
msgid "reverse() argument"
-msgstr "параметр reverse()"
+msgstr "параметра reverse()"
msgid "E258: Unable to send to client"
msgstr "E258: Не могу ответить клиенту"
+#. Используется для получения "значение параметра p()" в E741 и E742
msgid "sort() argument"
-msgstr "параметр sort()"
+msgstr "параметра sort()"
msgid "E702: Sort compare function failed"
msgstr "E702: Неудачное завершение функции сравнения при сортировке"
@@ -707,13 +715,15 @@
msgid "E705: Variable name conflicts with existing function: %s"
msgstr "E705: Имя переменной конфликтует с существующей функцией: %s"
+#. Используется с %s = "параметера p"
#, c-format
msgid "E741: Value is locked: %s"
-msgstr "E741: Значение заблокировано: %s"
+msgstr "E741: Значение %s заблокировано"
msgid "Unknown"
msgstr "Неизвестно"
+#. Используется с %s = "параметера p()"
#, c-format
msgid "E742: Cannot change value of %s"
msgstr "E742: Невозможно изменить значение %s"