Updated runtime files.

23 files changed, 597 insertions, 272 deletions

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 9be856058e..1df82817b7 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.4a.  Last change: 2013 Jun 29
+*map.txt*       For Vim version 7.4a.  Last change: 2013 Jul 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -597,7 +597,7 @@ this (see |<>|).  Example: >
 To avoid mapping of the characters you type in insert or Command-line mode,
 type a CTRL-V first.  The mapping in Insert mode is disabled if the 'paste'
 option is on.
-
+							*map-error*
 Note that when an error is encountered (that causes an error message or beep)
 the rest of the mapping is not executed.  This is Vi-compatible.
 
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index eaab1b8dea..a3592aa0b1 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.4a.  Last change: 2012 Mar 23
+*repeat.txt*    For Vim version 7.4a.  Last change: 2013 Jul 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -54,7 +54,7 @@ selection, the same SIZE of area is used, see |visual-repeat|.
 			Same as :g!.
 
 Instead of the '/' which surrounds the {pattern}, you can use any other
-single byte character, but not an alphanumeric character, '\', '"' or '|'.
+single byte character, but not an alphabetic character, '\', '"' or '|'.
 This is useful if you want to include a '/' in the search pattern or
 replacement string.
 
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 1dc7e6d927..dadc891983 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.4a.  Last change: 2013 Jun 12
+*starting.txt*  For Vim version 7.4a.  Last change: 2013 Jul 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -774,7 +774,8 @@ accordingly.  Vim proceeds in this order:
 	easy to copy it to another system.
 
 	If Vim was started with "-u filename", the file "filename" is used.
-	All following initializations until 4. are skipped.
+	All following initializations until 4. are skipped. $MYVIMRC is not
+	set.
 	"vim -u NORC" can be used to skip these initializations without
 	reading a file.  "vim -u NONE" also skips loading plugins.  |-u|
 
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 592fb17cf6..f5b61b415f 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -6734,6 +6734,7 @@ map-<SID>	map.txt	/*map-<SID>*
 map-ambiguous	map.txt	/*map-ambiguous*
 map-backtick	tips.txt	/*map-backtick*
 map-comments	map.txt	/*map-comments*
+map-error	map.txt	/*map-error*
 map-examples	map.txt	/*map-examples*
 map-keys-fails	map.txt	/*map-keys-fails*
 map-listing	map.txt	/*map-listing*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 0e269807f4..ae4ca919b1 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4a.  Last change: 2013 Jul 17
+*todo.txt*      For Vim version 7.4a.  Last change: 2013 Jul 24
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,18 +34,6 @@ not be repeated below, unless there is extra information.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Edit changed-7.4 text.
-
-Patch for this bug: (Ken Takata, 2013 Jul 17)
-8   Win32: When mouse is hidden and in the toolbar, moving it won't make it
-    appear. (Sami Salonen)
-
-This results in 'fileformat' set to "dos" instead of "unix". (Ingo Karkat,
-2013 Jul 16)
-    :set fileformats=dos,unix
-    :new ++ff=unix
-Also for ++bin and ++enc.
-
 Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
 
 Patch to add "acl" and "xpm" as a feature. (Ken Takata, 2013 Jul 8)
@@ -70,6 +58,10 @@ GTK: problem with 'L' in 'guioptions' changing the window width.
 
 Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
 
+The BufUnload event is triggered when re-using the empty buffer.
+(Pokey Rule, 2013 Jul 22)
+Patch by Marcin Szamotulski, 2013 Jul 22.
+
 The CompleteDone autocommand needs some info passed to it:
 - The word that was selected (empty if abandoned complete)
 - Type of completion: tag, omnifunc, user func.
@@ -187,7 +179,6 @@ Python: Be able to define a Python function that can be called directly from
 Vim script.  Requires converting the arguments and return value, like with
 vim.bindeval().
 
-
 Patch for :tabcloseleft, after closing a tab go to left tab. (William Bowers,
 2012 Aug 4)
 
@@ -451,7 +442,7 @@ May 24)  Update May 26.
 
 Patch for :tabrecently. (Hirokazu Yoshida, 2012 Jan 30)
 
-Problem with "syn sync gouphere". (Gustavo Niemeyer, 2011 Jan 27)
+Problem with "syn sync grouphere". (Gustavo Niemeyer, 2011 Jan 27)
 
 Loading autoload script even when usage is inside "if 0". (Christian Brabandt,
 2010 Dec 18)
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index aa674c61a8..173451ccea 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.4a.  Last change: 2013 Jul 13
+*version7.txt*  For Vim version 7.4a.  Last change: 2013 Jul 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -9150,7 +9150,7 @@ Files:	    src/ops.c
 
 Patch 7.2.293
 Problem:    When setting 'comments' option it may be used in a wrong way. 
-Solution:   Don't increment after skipping over digets. (Yukihiro Nakadaira)
+Solution:   Don't increment after skipping over digits. (Yukihiro Nakadaira)
 Files:	    src/misc1.c
 
 Patch 7.2.294
@@ -10192,131 +10192,82 @@ Better Python interface				*better-python-interface*
 
 Added |python-bindeval| function. Unlike |python-eval| this one returns 
 |python-Dictionary|, |python-List| and |python-Function| objects for 
-dictionaries lists and functions respectively in place of their python 
+dictionaries lists and functions respectively in place of their Python 
 built-in equivalents (or None if we are talking about function references).
-   For simple types this function returns python built-in types and not only 
-python `str()` like |python-eval| does. On python 3 it will return `bytes()` 
+   For simple types this function returns Python built-in types and not only 
+Python `str()` like |python-eval| does. On Python 3 it will return `bytes()` 
 objects in place of `str()` ones avoiding possibility of UnicodeDecodeError.
-   Interface of new objects mimics standard python `dict()` and `list()`
+   Interface of new objects mimics standard Python `dict()` and `list()`
 interfaces to some extent. Extent will be improved in the future.
 
 Added special |python-vars| objects also available for |python-buffer| and 
-|python-window|. They ease access to VimL variables from python.
+|python-window|. They ease access to VimL variables from Python.
 
 Now you no longer need to alter `sys.path` to import your module: special 
 hooks are responsible for importing from {rtp}/python2, {rtp}/python3 and 
-{rtp}/pythonx directories (for python 2, python 3 and both respectively). 
+{rtp}/pythonx directories (for Python 2, Python 3 and both respectively). 
 See |python-special-path|.
 
 Added possibility to work with |tabpage|s through |python-tabpage| object.
 
-Added automatic conversion of vim errors and exceptions to python 
+Added automatic conversion of Vim errors and exceptions to Python 
 exceptions.
 
-Changed the behavior of |python-buffers| object: it now uses buffer numbers 
+Changed the behavior of the |python-buffers| object: it now uses buffer numbers 
 as keys in place of the index of the buffer in the internal buffer list. 
 This should not break anything as the only way to get this index was 
 iterating over |python-buffers|.
 
 Added |:pydo| and |:py3do| commands.
 
-Added |pyeval()| and |py3eval()| functions.
+Added the |pyeval()| and |py3eval()| functions.
 
-Now in all places which previously accepted `str()` objects in both python 
-version both `str()` and `unicode()` (python 2) or `bytes()` and `str()` 
-(python 3) are accepted.
+Now in all places which previously accepted `str()` objects, `str()` and
+`unicode()` (Python 2) or `bytes()` and `str()` (Python 3) are accepted.
 
 |python-window| has gained `.col` and `.row` attributes that are currently 
 the only way to get internal window positions.
 
-Added or fixed support for `dir()` in vim python objects.
-
-Old python versions (≤2.2) are no longer supported. Building with them did 
-not work anyway.
+Added or fixed support for `dir()` in Vim Python objects.
 
 
 Changed							*changed-7.4*
 -------
 
-Functions:
-	Added ability to use |Dictionary-function|s for |sort()|ing, via 
-	optional third argument. (Nikolay Pavlov)
-
-	Added special |expand()| argument that expands to the current line 
-	number.
-
-	Made it possible to force |char2nr()| always give unicode codepoints 
-	regardless of current encoding. (Yasuhiro Matsumoto)
-
-	Made it possible for functions generating file list generate |List| 
-	and not NL-separated string. (e.g. |glob()|, |expand()|) (Christian 
-	Brabandt)
-
-	Functions that obtain variables from the specific window, tabpage or 
-	buffer scope dictionary can now return specified default value in 
-	place of empty string in case variable is not found. (|gettabvar()|, 
-	|getwinvar()|, |getbufvar()|) (Shougo Matsushita, Hirohito Higashi)
+Old Python versions (≤2.2) are no longer supported. Building with them did 
+not work anyway.
 
 Options:
-	Added ability to automatically save selection into the system 
-	clipboard when using non-GUI version of vim (autoselectplus in 
-	'clipboard'). Also added ability to use system clipboard as default 
-	register (previously only primary selection could be used). (Ivan 
-	Krasilnikov, Christian Brabandt, Bram Moolenaar)
-
-	Added special 'shiftwidth' value that makes 'sw' follow 'tabstop'. As 
-	indenting via 'indentexpr' became tricky |shiftwidth()| function was 
-	added. Also added equivalent special value to 'softtabstop' option. 
-	(Christian Brabandt, so8res)
-
-	Added ability to delete comment leader when using |J| by `j` flag in 
-	'formatoptions' (|fo-table|). (Lech Lorens)
-
-	Added ability to control indentation inside namespaces: |cino-N|. 
-	(Konstantin Lepa)
+	Added ability to automatically save the selection into the system 
+	clipboard when using non-GUI version of Vim (autoselectplus in 
+	'clipboard'). Also added ability to use the system clipboard as
+	default register (previously only primary selection could be used).
+	(Ivan Krasilnikov, Christian Brabandt, Bram Moolenaar)
 
-	Added ability to control alignment inside `if` condition separately 
-	from alignment inside function arguments: |cino-k|. (Lech Lorens)
+	Added a special 'shiftwidth' value that makes 'sw' follow 'tabstop'.
+	As indenting via 'indentexpr' became tricky |shiftwidth()| function
+	was added. Also added equivalent special value to 'softtabstop'
+	option.  (Christian Brabandt, so8res)
 
-	Added ability to show absolute number in number column when 
-	'relativenumber' option is on. (Christian Brabandt)
-
-Comands:
-	Made it possible to remove all signs from the current buffer using 
-	|:sign-unplace|. (Christian Brabandt)
-
-	Added |:language| autocompletion. (Dominique Pelle)
+	Show absolute number in number column when 'relativenumber' option is
+	on.  Now there are four combinations with 'number' and
+	'relativenumber'.  (Christian Brabandt)
 
+Commands:
 	|:diffoff| now saves the local values of some settings and restores 
 	them in place of blindly resetting them to the defaults. (Christian 
 	Brabandt)
 
-	Added |:map-nowait| creating mapping which when having lhs that is the 
-	prefix of another mapping’s lhs will not allow vim to wait for user to 
-	type more characters to resolve ambiguity, forcing vim to take the 
-	shorter alternative: one with <nowait>.
-
-	Added more |:command-complete| completion types: |:behave| suboptions, 
-	color schemes, compilers, |:cscope| suboptions, files from 'path', 
-	|:history| suboptions, locale names, |:syntime| suboptions, user 
-	names. (Dominique Pelle)
-
 Other:
-	Improved support for cmd.exe. (Ben Fritz, Bram Moolenaar)
-
-	Added |v:windowid| variable containing current window number in GUI 
-	vim. (Christian J. Robinson, Lech Lorens)
-
-	Lua interface now also uses userdata binded to vim structures. (Taro 
+	Lua interface now also uses userdata binded to Vim structures. (Taro 
 	Muraoka, Luis Carvalho)
 
-	Added rxvt-unicode and >xterm-277 mouse support. (Yiding Jia, Hayaki 
-	Saito)
-
 Added							*added-7.4*
 -----
 
-Added support for |Lists| and |Dictionaries| in |viminfo|. (Christian 
+Various syntax, indent and other plugins were added.
+
+Added support for |Lists| and |Dictionaries| in |viminfo|. (Christian
 Brabandt)
 
 Functions:
@@ -10331,6 +10282,24 @@ Functions:
 	Debugging functions: |screenattr()|, |screenchar()|, |screencol()|, 
 	|screenrow()|. (Simon Ruderich, Bram Moolenaar)
 
+	Added ability to use |Dictionary-function|s for |sort()|ing, via 
+	optional third argument. (Nikolay Pavlov)
+
+	Added special |expand()| argument that expands to the current line 
+	number.
+
+	Made it possible to force |char2nr()| always give unicode codepoints 
+	regardless of current encoding. (Yasuhiro Matsumoto)
+
+	Made it possible for functions generating file list generate |List| 
+	and not NL-separated string. (e.g. |glob()|, |expand()|) (Christian 
+	Brabandt)
+
+	Functions that obtain variables from the specific window, tabpage or 
+	buffer scope dictionary can now return specified default value in 
+	place of empty string in case variable is not found. (|gettabvar()|, 
+	|getwinvar()|, |getbufvar()|) (Shougo Matsushita, Hirohito Higashi)
+
 Autocommands:
 	Added |InsertCharPre| event launched before inserting character. 
 	(Jakson A. Aquino)
@@ -10338,7 +10307,7 @@ Autocommands:
 	Added |CompleteDone| event launched after finishing completion in 
 	insert mode. (idea by Florian Klein)
 
-	Added |QuitPre| event launched when commands that can either close vim 
+	Added |QuitPre| event launched when commands that can either close Vim 
 	or only some window(s) are launched.
 
 	Added |TextChanged| and |TextChangedI| events launched when text is 
@@ -10347,14 +10316,45 @@ Autocommands:
 Commands:
 	|:syntime| command useful for debugging.
 
+	Made it possible to remove all signs from the current buffer using 
+	|:sign-unplace|. (Christian Brabandt)
+
+	Added |:language| autocompletion. (Dominique Pelle)
+
+	Added more |:command-complete| completion types: |:behave| suboptions, 
+	color schemes, compilers, |:cscope| suboptions, files from 'path', 
+	|:history| suboptions, locale names, |:syntime| suboptions, user 
+	names. (Dominique Pelle)
+
+	Added |:map-nowait| creating mapping which when having lhs that is the 
+	prefix of another mapping’s lhs will not allow Vim to wait for user to 
+	type more characters to resolve ambiguity, forcing Vim to take the 
+	shorter alternative: one with <nowait>.
+
 Options:
 	Made it possible to ignore case when completing: 'wildignorecase'.
 
-Various syntax, indent and other plugins were added.
+	Added ability to delete comment leader when using |J| by `j` flag in 
+	'formatoptions' (|fo-table|). (Lech Lorens)
 
+	Added ability to control indentation inside namespaces: |cino-N|. 
+	(Konstantin Lepa)
 
-Fixed							*fixed-7.4*
------
+	Added ability to control alignment inside `if` condition separately 
+	from alignment inside function arguments: |cino-k|. (Lech Lorens)
+
+Other:
+	Improved support for cmd.exe. (Ben Fritz, Bram Moolenaar)
+
+	Added |v:windowid| variable containing current window number in GUI 
+	Vim. (Christian J. Robinson, Lech Lorens)
+
+	Added rxvt-unicode and >xterm-277 mouse support. (Yiding Jia, Hayaki 
+	Saito)
+
+
+All changes in 7.4						*fixed-7.4*
+------------------
 
 Patch 7.3.001
 Problem:    When editing "src/main.c" and 'path' set to "./proto",
@@ -12181,7 +12181,7 @@ Problem:    Can't compile with tiny features.
 Solution:   Add #ifdef around win_valid().
 Files:	    src/buffer.c
 
-Patch 7.3.313 after 7.3.307)
+Patch 7.3.313 (after 7.3.307)
 Problem:    One more warning when compiling with dynamic Python 3.
 Solution:   Change PySliceObject to PyObject.
 Files:	    src/if_python3.c
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f408d9960c..1a0a0c35d7 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2013 Jun 24
+" Last Change:	2013 Jul 21
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1407,6 +1407,9 @@ au BufNewFile,BufRead *.rcp			setf pilrc
 " Pine config
 au BufNewFile,BufRead .pinerc,pinerc,.pinercex,pinercex		setf pine
 
+" PL/1, PL/I
+au BufNewFile,BufRead *.pli,*.pl1		setf pli
+
 " PL/M (also: *.inp)
 au BufNewFile,BufRead *.plm,*.p36,*.pac		setf plm
 
diff --git a/runtime/ftplugin/perl.vim b/runtime/ftplugin/perl.vim
index 6508356401..415010c96e 100644
--- a/runtime/ftplugin/perl.vim
+++ b/runtime/ftplugin/perl.vim
@@ -3,7 +3,7 @@
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2013-05-11
+" Last Change:   2013 Jul 24
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
diff --git a/runtime/ftplugin/perl6.vim b/runtime/ftplugin/perl6.vim
index 4168e7ff43..1974b33668 100644
--- a/runtime/ftplugin/perl6.vim
+++ b/runtime/ftplugin/perl6.vim
@@ -3,7 +3,7 @@
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2013-05-11
+" Last Change:   2013 Jul 24
 " Contributors:  Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
 "
 " Based on ftplugin/perl.vim by Dan Sharp <dwsharp at hotmail dot com>
diff --git a/runtime/ftplugin/tt2html.vim b/runtime/ftplugin/tt2html.vim
new file mode 100644
index 0000000000..abb1ed87e4
--- /dev/null
+++ b/runtime/ftplugin/tt2html.vim
@@ -0,0 +1,13 @@
+" Language:      TT2 embedded with HTML
+" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Homepage:      http://github.com/vim-perl/vim-perl
+" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
+" Last Change:   2013 Jul 24
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+    finish
+endif
+
+" Just use the HTML plugin for now.
+runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
diff --git a/runtime/ftplugin/xs.vim b/runtime/ftplugin/xs.vim
index 6e4d99fb98..5ac2353d0a 100644
--- a/runtime/ftplugin/xs.vim
+++ b/runtime/ftplugin/xs.vim
@@ -3,7 +3,7 @@
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2009-08-14
+" Last Change:   2013 Jul 24
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/indent/perl.vim b/runtime/indent/perl.vim
index ccdbeceaef..8b672dd37d 100644
--- a/runtime/indent/perl.vim
+++ b/runtime/indent/perl.vim
@@ -3,7 +3,7 @@
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   May 12, 2013
+" Last Change:   2013 Jul 24
 
 " Suggestions and improvements by :
 "   Aaron J. Sherman (use syntax for hints)
diff --git a/runtime/indent/perl6.vim b/runtime/indent/perl6.vim
index 60ee640b16..3de71aa669 100644
--- a/runtime/indent/perl6.vim
+++ b/runtime/indent/perl6.vim
@@ -3,7 +3,7 @@
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2013-05-12
+" Last Change:   2013 Jul 24
 " Contributors:  Andy Lester <andy@petdance.com>
 "                Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
 "
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index 2b14bf2bed..8b36b72322 100644
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -6,7 +6,7 @@
 "               Nikolai Weibull (Add CSS2 support)
 " Maintainer:   Jules Wang      <w.jq0722@gmail.com>
 " URL:          https://github.com/JulesWang/css.vim
-" Last Change:  2012 Dec 15
+" Last Change:  2013 Jul 23
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -14,9 +14,11 @@ if !exists("main_syntax")
   if version < 600
     syntax clear
   elseif exists("b:current_syntax")
-  finish
-endif
+    finish
+  endif
   let main_syntax = 'css'
+elseif exists("b:current_syntax") && b:current_syntax == "css"
+  finish
 endif
 
 let s:cpo_save = &cpo
diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim
index 62a70bfc02..484e2cca65 100644
--- a/runtime/syntax/diff.vim
+++ b/runtime/syntax/diff.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	Diff (context or unified)
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2010 Aug 03
+"               Translations by Jakson Alves de Aquino.
+" Last Change:	2013 Jul 24
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -14,275 +15,309 @@ syn match diffIdentical	"^Files .* and .* are identical$"
 syn match diffDiffer	"^Files .* and .* differ$"
 syn match diffBDiffer	"^Binary files .* and .* differ$"
 syn match diffIsA	"^File .* is a .* while file .* is a .*"
-syn match diffNoEOL	"^No newline at end of file .*"
+syn match diffNoEOL	"^\\ No newline at end of file .*"
 syn match diffCommon	"^Common subdirectories: .*"
 
 " ca
-syn match diffOnly	"^Només a .*: .*$"
+syn match diffOnly	"^Només a .*"
 syn match diffIdentical	"^Els fitxers .* i .* són idèntics$"
 syn match diffDiffer	"^Els fitxers .* i .* difereixen$"
 syn match diffBDiffer	"^Els fitxers .* i .* difereixen$"
-syn match diffIsA	"^El fitxer .* és un .* mentre que el fitxer .* és un .*$"
-syn match diffNoEOL	"^No hi ha cap caràcter de salt de línia al final del fitxer"
-syn match diffCommon	"^Subdirectoris comuns: .* i .*$"
+syn match diffIsA	"^El fitxer .* és un .* mentre que el fitxer .* és un .*"
+syn match diffNoEOL	"^\\ No hi ha cap caràcter de salt de línia al final del fitxer"
+syn match diffCommon	"^Subdirectoris comuns: .* i .*"
 
 " cs
-syn match diffOnly	"^Pouze v .*: .*$"
+syn match diffOnly	"^Pouze v .*"
 syn match diffIdentical	"^Soubory .* a .* jsou identické$"
 syn match diffDiffer	"^Soubory .* a .* jsou různé$"
+syn match diffBDiffer	"^Binární soubory .* a .* jsou rozdílné$"
 syn match diffBDiffer	"^Soubory .* a .* jsou různé$"
-syn match diffIsA	"^Soubor .* je .* pokud soubor .* je .*$"
-syn match diffNoEOL	"^Chybí znak konce řádku na konci souboru"
-syn match diffCommon	"^Společné podadresáře: .* a .*$"
+syn match diffIsA	"^Soubor .* je .* pokud soubor .* je .*"
+syn match diffNoEOL	"^\\ Chybí znak konce řádku na konci souboru"
+syn match diffCommon	"^Společné podadresáře: .* a .*"
 
 " da
-syn match diffOnly	"^Kun i .*: .*$"
+syn match diffOnly	"^Kun i .*"
 syn match diffIdentical	"^Filerne .* og .* er identiske$"
 syn match diffDiffer	"^Filerne .* og .* er forskellige$"
 syn match diffBDiffer	"^Binære filer .* og .* er forskellige$"
-syn match diffIsA	"^Filen .* er en .* mens filen .* er en .*$"
-syn match diffNoEOL	"^Intet linjeskift ved filafslutning"
-syn match diffCommon	"^Identiske underkataloger: .* og .*$"
+syn match diffIsA	"^Filen .* er en .* mens filen .* er en .*"
+syn match diffNoEOL	"^\\ Intet linjeskift ved filafslutning"
+syn match diffCommon	"^Identiske underkataloger: .* og .*"
 
 " de
-syn match diffOnly	"^Nur in .*: .*.$"
+syn match diffOnly	"^Nur in .*"
 syn match diffIdentical	"^Dateien .* und .* sind identisch.$"
 syn match diffDiffer	"^Dateien .* und .* sind verschieden.$"
 syn match diffBDiffer	"^Binärdateien .* and .* sind verschieden.$"
+syn match diffBDiffer	"^Binärdateien .* und .* sind verschieden.$"
 syn match diffIsA	"^Datei .* ist ein .* während Datei .* ein .* ist.$"
-syn match diffNoEOL	"^Kein Zeilenumbruch am Dateiende."
+syn match diffNoEOL	"^\\ Kein Zeilenumbruch am Dateiende."
 syn match diffCommon	"^Gemeinsame Unterverzeichnisse: .* und .*.$"
 
 " el
-syn match diffOnly	"^Μόνο στο .*: .*$"
+syn match diffOnly	"^Μόνο στο .*"
 syn match diffIdentical	"^Τα αρχεία .* καί .* είναι πανομοιότυπα$"
 syn match diffDiffer	"^Τα αρχεία .* και .* διαφέρουν$"
 syn match diffBDiffer	"^Τα αρχεία .* και .* διαφέρουν$"
-syn match diffIsA	"^Το αρχείο .* είναι .* ενώ το αρχείο .* είναι .*$"
-syn match diffNoEOL	"^Δεν υπάρχει χαρακτήρας νέας γραμμής στο τέλος του αρχείου"
+syn match diffIsA	"^Το αρχείο .* είναι .* ενώ το αρχείο .* είναι .*"
+syn match diffNoEOL	"^\\ Δεν υπάρχει χαρακτήρας νέας γραμμής στο τέλος του αρχείου"
 syn match diffCommon	"^Οι υποκατάλογοι .* και .* είναι ταυτόσημοι$"
 
 " eo
-syn match diffOnly	"^Nur en .*: .*$"
+syn match diffOnly	"^Nur en .*"
 syn match diffIdentical	"^Dosieroj .* kaj .* estas samaj$"
 syn match diffDiffer	"^Dosieroj .* kaj .* estas malsamaj$"
 syn match diffBDiffer	"^Dosieroj .* kaj .* estas malsamaj$"
-syn match diffIsA	"^Dosiero .* estas .*, dum dosiero .* estas .*$"
-syn match diffNoEOL	"^Mankas linifino ĉe fino de dosiero"
-syn match diffCommon	"^Komunaj subdosierujoj: .* kaj .*$"
+syn match diffIsA	"^Dosiero .* estas .*, dum dosiero .* estas .*"
+syn match diffNoEOL	"^\\ Mankas linifino ĉe fino de dosiero"
+syn match diffCommon	"^Komunaj subdosierujoj: .* kaj .*"
 
 " es
-syn match diffOnly	"^Sólo en .*: .*$"
+syn match diffOnly	"^Sólo en .*"
 syn match diffIdentical	"^Los ficheros .* y .* son idénticos$"
 syn match diffDiffer	"^Los ficheros .* y .* son distintos$"
 syn match diffBDiffer	"^Los ficheros binarios .* y .* son distintos$"
-syn match diffIsA	"^El fichero .* es un .* mientras que el .* es un .*$"
-syn match diffNoEOL	"^No hay ningún carácter de nueva línea al final del fichero"
-syn match diffCommon	"^Subdirectorios comunes: .* y .*$"
+syn match diffIsA	"^El fichero .* es un .* mientras que el .* es un .*"
+syn match diffNoEOL	"^\\ No hay ningún carácter de nueva línea al final del fichero"
+syn match diffCommon	"^Subdirectorios comunes: .* y .*"
 
 " fi
-syn match diffOnly	"^Vain hakemistossa .*: .*$"
+syn match diffOnly	"^Vain hakemistossa .*"
 syn match diffIdentical	"^Tiedostot .* ja .* ovat identtiset$"
 syn match diffDiffer	"^Tiedostot .* ja .* eroavat$"
 syn match diffBDiffer	"^Binääritiedostot .* ja .* eroavat$"
-syn match diffIsA	"^Tiedosto .* on .*, kun taas tiedosto .* on .*$"
-syn match diffNoEOL	"^Ei rivinvaihtoa tiedoston lopussa"
-syn match diffCommon	"^Yhteiset alihakemistot: .* ja .*$"
+syn match diffIsA	"^Tiedosto .* on .*, kun taas tiedosto .* on .*"
+syn match diffNoEOL	"^\\ Ei rivinvaihtoa tiedoston lopussa"
+syn match diffCommon	"^Yhteiset alihakemistot: .* ja .*"
 
 " fr
-syn match diffOnly	"^Seulement dans .*: .*$"
-syn match diffIdentical	"^Les fichiers .* et .* sont identiques.$"
-syn match diffDiffer	"^Les fichiers .* et .* sont différents.$"
-syn match diffBDiffer	"^Les fichiers binaires .* et .* sont différents.$"
-syn match diffIsA	"^Le fichier .* est un .* alors que le fichier .* est un .*$"
-syn match diffNoEOL	"^Pas de fin de ligne à la fin du fichier."
-syn match diffCommon	"^Les sous-répertoires .* et .* sont identiques.$"
+syn match diffOnly	"^Seulement dans .*"
+syn match diffIdentical	"^Les fichiers .* et .* sont identiques.*"
+syn match diffDiffer	"^Les fichiers .* et .* sont différents.*"
+syn match diffBDiffer	"^Les fichiers binaires .* et .* sont différents.*"
+syn match diffIsA	"^Le fichier .* est un .* alors que le fichier .* est un .*"
+syn match diffNoEOL	"^\\ Pas de fin de ligne à la fin du fichier.*"
+syn match diffCommon	"^Les sous-répertoires .* et .* sont identiques.*"
 
 " ga
-syn match diffOnly	"^I .* amháin: .*$"
-syn match diffIdentical	"^Is comhionann iad na comhaid .* agus .*$"
-syn match diffDiffer	"^Tá difríocht idir na comhaid .* agus .*$"
-syn match diffBDiffer	"^Tá difríocht idir na comhaid .* agus .*$"
-syn match diffIsA	"^Tá comhad .* ina .* ach tá comhad .* ina .*$"
-syn match diffNoEOL	"^Gan líne nua ag an chomhadchríoch"
-syn match diffCommon	"^Fochomhadlanna i gcoitianta: .* agus .*$"
+syn match diffOnly	"^I .* amháin: .*"
+syn match diffIdentical	"^Is comhionann iad na comhaid .* agus .*"
+syn match diffDiffer	"^Tá difríocht idir na comhaid .* agus .*"
+syn match diffBDiffer	"^Tá difríocht idir na comhaid .* agus .*"
+syn match diffIsA	"^Tá comhad .* ina .* ach tá comhad .* ina .*"
+syn match diffNoEOL	"^\\ Gan líne nua ag an chomhadchríoch"
+syn match diffCommon	"^Fochomhadlanna i gcoitianta: .* agus .*"
 
 " gl
-syn match diffOnly	"^Só en .*: .*$"
+syn match diffOnly	"^Só en .*"
 syn match diffIdentical	"^Os ficheiros .* e .* son idénticos$"
 syn match diffDiffer	"^Os ficheiros .* e .* son diferentes$"
 syn match diffBDiffer	"^Os ficheiros binarios .* e .* son diferentes$"
-syn match diffIsA	"^O ficheiro .* é un .* mentres que o ficheiro .* é un .*$"
-syn match diffNoEOL	"^Non hai un salto de liña na fin da liña"
-syn match diffCommon	"^Subdirectorios comúns: .* e .*$"
+syn match diffIsA	"^O ficheiro .* é un .* mentres que o ficheiro .* é un .*"
+syn match diffNoEOL	"^\\ Non hai un salto de liña na fin da liña"
+syn match diffCommon	"^Subdirectorios comúns: .* e .*"
 
 " he
-syn match diffOnly	"^.*-ב קר אצמנ .*$"
+syn match diffOnly	"^.*-ב קר אצמנ .*"
 syn match diffIdentical	"^םיהז םניה .*-ו .* םיצבקה$"
 syn match diffDiffer	"^הזמ הז םינוש `.*'-ו `.*' םיצבקה$"
 syn match diffBDiffer	"^הזמ הז םינוש `.*'-ו `.*' םיירניב םיצבק$"
 syn match diffIsA	"^.* .*-ל .* .* תוושהל ןתינ אל$"
-syn match diffNoEOL	"^ץבוקה ףוסב השדח-הרוש ות רסח"
+syn match diffNoEOL	"^\\ ץבוקה ףוסב השדח-הרוש ות רסח"
 syn match diffCommon	"^.*-ו .* :תוהז תויקית-תת$"
 
+" hr
+syn match diffOnly	"^Samo u .*"
+syn match diffIdentical	"^Datoteke .* i .* su identične$"
+syn match diffDiffer	"^Datoteke .* i .* se razlikuju$"
+syn match diffBDiffer	"^Binarne datoteke .* i .* se razlikuju$"
+syn match diffIsA	"^Datoteka .* je .*, a datoteka .* je .*"
+syn match diffNoEOL	"^\\ Nema novog retka na kraju datoteke"
+syn match diffCommon	"^Uobičajeni poddirektoriji: .* i .*"
+
 " hu
-syn match diffOnly	"^Csak .* -ben: .*$"
+syn match diffOnly	"^Csak .* -ben: .*"
 syn match diffIdentical	"^.* és .* fájlok azonosak$"
 syn match diffDiffer	"^A(z) .* és a(z) .* fájlok különböznek$"
 syn match diffBDiffer	"^A(z) .* és a(z) .* fájlok különböznek$"
-syn match diffIsA	"^A(z) .* fájl egy .*, viszont a(z) .* fájl egy .*$"
-syn match diffNoEOL	"^Nincs újsor a fájl végén"
-syn match diffCommon	"^Közös alkönyvtárak: .* és .*$"
+syn match diffIsA	"^A(z) .* fájl egy .*, viszont a(z) .* fájl egy .*"
+syn match diffNoEOL	"^\\ Nincs újsor a fájl végén"
+syn match diffCommon	"^Közös alkönyvtárak: .* és .*"
 
 " id
-syn match diffOnly	"^Hanya dalam .*: .*$"
+syn match diffOnly	"^Hanya dalam .*"
 syn match diffIdentical	"^File .* dan .* identik$"
 syn match diffDiffer	"^Berkas .* dan .* berbeda$"
 syn match diffBDiffer	"^File biner .* dan .* berbeda$"
-syn match diffIsA	"^File .* adalah .* sementara file .* adalah .*$"
-syn match diffNoEOL	"^Tidak ada baris-baru di akhir dari berkas"
-syn match diffCommon	"^Subdirektori sama: .* dan .*$"
+syn match diffIsA	"^File .* adalah .* sementara file .* adalah .*"
+syn match diffNoEOL	"^\\ Tidak ada baris-baru di akhir dari berkas"
+syn match diffCommon	"^Subdirektori sama: .* dan .*"
 
 " it
-syn match diffOnly	"^Solo in .*: .*$"
+syn match diffOnly	"^Solo in .*"
 syn match diffIdentical	"^I file .* e .* sono identici$"
 syn match diffDiffer	"^I file .* e .* sono diversi$"
 syn match diffBDiffer	"^I