14 files changed, 162 insertions, 100 deletions
diff --git a/runtime/doc/evim-fr.1 b/runtime/doc/evim-fr.1
index ab19a9094..898ed70c2 100644
--- a/runtime/doc/evim-fr.1
+++ b/runtime/doc/evim-fr.1
@@ -1,4 +1,4 @@
-.TH EVIM 1 "16 février 2002 February 16"
+.TH EVIM 1 "16 février 2002"
 .SH NAME
 evim \- Ť Easy Vim ť, édite un fichier avec Vim sans utiliser les modes
 .SH SYNOPSIS
@@ -54,4 +54,4 @@ Voir le menu Aide/Remerciements ou ":help credits" dans
 .SH TRADUCTION
 Cette page de manuel a été traduite David Blanchet.
 <david.blanchet@free.fr> 2005-03-26.
-Mise ŕ jour 2012-05-06, Dominique Pellé <dominique.pelle@gmail.com>
+Mise ŕ jour 2013-05-10, Dominique Pellé <dominique.pelle@gmail.com>
diff --git a/runtime/doc/evim-fr.UTF-8.1 b/runtime/doc/evim-fr.UTF-8.1
index 267366ff5..2b38e66cb 100644
--- a/runtime/doc/evim-fr.UTF-8.1
+++ b/runtime/doc/evim-fr.UTF-8.1
@@ -1,4 +1,4 @@
-.TH EVIM 1 "16 fĂŠvrier 2002 February 16"
+.TH EVIM 1 "16 fĂŠvrier 2002"
 .SH NAME
 evim \- ÂŤ Easy Vim Âť, ĂŠdite un fichier avec Vim sans utiliser les modes
 .SH SYNOPSIS
@@ -54,4 +54,4 @@ Voir le menu Aide/Remerciements ou ":help credits" dans
 .SH TRADUCTION
 Cette page de manuel a ĂŠtĂŠ traduite David Blanchet.
 <david.blanchet@free.fr> 2005-03-26.
-Mise Ă  jour 2012-05-06, Dominique PellĂŠ <dominique.pelle@gmail.com>
+Mise Ă  jour 2013-05-10, Dominique PellĂŠ <dominique.pelle@gmail.com>
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 67a5c147f..6367df6a4 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.3.  Last change: 2011 Jun 19
+*filetype.txt*  For Vim version 7.3.  Last change: 2013 May 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -603,7 +603,7 @@ Since the text for this plugin is rather long it has been put in a separate
 file: |ft_sql.txt|.
 
 
-TEX							*ft-tex-plugin*
+TEX						*ft-tex-plugin* *g:tex_flavor*
 
 If the first line of a *.tex file has the form >
 	%&<format>
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 4f23d079d..fffc4c789 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 7.3.  Last change: 2013 May 21
+*if_pyth.txt*   For Vim version 7.3.  Last change: 2013 May 25
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 98f22ddb8..6b01d7c17 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.3.  Last change: 2013 May 17
+*options.txt*	For Vim version 7.3.  Last change: 2013 May 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -5516,7 +5516,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	matches will be highlighted.  This is used to avoid that Vim hangs
 	when using a very complicated pattern.
 
-						*'regexpengine''* *'re'*
+						*'regexpengine'* *'re'*
 'regexpengine' 're'	number	(default 0)
 			global
 			{not in Vi}
@@ -7521,7 +7521,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	given, no further entry is used.
 	See |undo-persistence|.
 
-						*'undofile'* *'udf'*
+				*'undofile'* *'noundofile'* *'udf'* *'noudf'*
 'undofile' 'udf'	boolean	(default off)
 			local to buffer
 			{not in Vi}
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 5f47889fd..e90e38839 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.3.  Last change: 2013 May 17
+*pattern.txt*   For Vim version 7.3.  Last change: 2013 May 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -698,6 +698,7 @@ overview.
 	For speed it's often much better to avoid this multi.  Try using "\zs"
 	instead |/\zs|.  To match the same as the above example:
 		an\_s\+\zsfile
+	At least set a limit for the look-behind, see below.
 
 	"\@<=" and "\@<!" check for matches just before what follows.
 	Theoretically these matches could start anywhere before this position.
@@ -710,6 +711,18 @@ overview.
 	Example			matches ~
 	\1\@<=,\([a-z]\+\)	",abc" in "abc,abc"
 
+\@123<=
+	Like "\@<=" but only look back 123 bytes. This avoids trying lots
+	of matches that are known to fail and make executing the pattern very
+	slow.  Example, check if there is a "<" just before "span":
+		/<\@1<=span
+	This will try matching "<" only one byte before "span", which is the
+	only place that works anyway.
+	After crossing a line boundary, the limit is relative to the end of
+	the line.  Thus the characters at the start of the line with the match
+	are not counted (this is just to keep it simple).
+	The number zero is the same as no limit.
+
 							*/\@<!*
 \@<!	Matches with zero width if the preceding atom does NOT match just
 	before what follows.  Thus this matches if there is no position in the
@@ -719,11 +732,16 @@ overview.
 	The match with the preceding atom is made to end just before the match
 	with what follows, thus an atom that ends in ".*" will work.
 	Warning: This can be slow (because many positions need to be checked
-	for a match).
+	for a match).  Use a limit if you can, see below.
 	Example			matches ~
 	\(foo\)\@<!bar		any "bar" that's not in "foobar"
 	\(\/\/.*\)\@<!in	"in" which is not after "//"
 
+\@123<!
+	Like "\@<!" but only look back 123 bytes. This avoids trying lots of
+	matches that are known to fail and make executing the pattern very
+	slow.
+
 							*/\@>*
 \@>	Matches the preceding atom like matching a whole pattern. {not in Vi}
 	Like "(?>pattern)" in Perl.
@@ -1193,6 +1211,8 @@ When "\Z" appears anywhere in the pattern, composing characters are ignored.
 Thus only the base characters need to match, the composing characters may be
 different and the number of composing characters may differ.  Only relevant
 when 'encoding' is "utf-8".
+Exception: If the pattern starts with one or more composing characters, these
+must match.
 
 When a composing character appears at the start of the pattern of after an
 item that doesn't include the composing character, a match is found at any
@@ -1202,8 +1222,20 @@ When using a dot and a composing character, this works the same as the
 composing character by itself, except that it doesn't matter what comes before
 this.
 
-The order of composing characters matters, even though changing the order
-doesn't change what a character looks like.  This may change in the future.
+The order of composing characters does not matter.  Also, the text may have
+more composing characters than the pattern, it still matches.  But all
+composing characters in the pattern must be found in the text.
+
+Suppose B is a base character and x and y are composing characters:
+	pattern		text		match ~
+	Bxy		Bxy		yes (perfect match)
+	Bxy		Byx		yes (order ignored)
+	Bxy		By		no (x missing)
+	Bxy		Bx		no (y missing)
+	Bx		Bx		yes (perfect mach)
+	Bx		By		no (x missing)
+	Bx		Bxy		yes (extra y ignored)
+	Bx		Byx		yes (extra y ignored)
 
 ==============================================================================
 9. Compare with Perl patterns				*perl-patterns*
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 86fb491e4..41f6d8c95 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.3.  Last change: 2013 May 20
+*starting.txt*  For Vim version 7.3.  Last change: 2013 May 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -439,7 +439,9 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		will wait for the edit session to finish (e.g., mail or
 		readnews).  See |amiga-window|.
 
-		MS-Windows: This option is not always supported.
+		MS-Windows: This option is not supported.  However, when
+		running Vim with an installed vim.bat or gvim.bat file it
+		works.
 		{not in Vi}
 
 
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 39c7839f4..d0f271b08 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.3.  Last change: 2013 Apr 05
+*syntax.txt*	For Vim version 7.3.  Last change: 2013 May 31
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -381,7 +381,11 @@ This is not a syntax file itself, but a script that converts the current
 window into HTML.  Vim opens a new window in which it builds the HTML file.
 
 After you save the resulting file, you can view it with any browser.  The
-colors should be exactly the same as you see them in Vim.
+colors should be exactly the same as you see them in Vim.  You can jump to
+specific lines by adding (for example) #L123 or #123 to the end of the URL in
+your browser's address bar (#123 only with javascript support). And with
+|g:html_dynamic_folds| enabled, you can show or hide the text that is folded
+in Vim.
 
 You are not supposed to set the 'filetype' or 'syntax' option to "2html"!
 Source the script to convert the current file: >
@@ -424,7 +428,11 @@ and last line to be converted.  Example, using the last set Visual area: >
 			|g:html_diff_one_file| is set, :TOhtml will convert
 			all windows which are part of the diff in the current
 			tab and place them side-by-side in a <table> element
-			in the generated HTML.
+			in the generated HTML. When this happens you can jump
+			to lines in specific windows with (for example) #W1L42
+			for line 42 in the first diffed window, or #W3L87 for
+			line 87 in the third. Omitting the window ID will
+			default to the first window if javascript is enabled.
 
 			Examples: >
 
@@ -1240,7 +1248,7 @@ to your startup file.
 ERLANG						*erlang.vim* *ft-erlang-syntax*
 
 Erlang is a functional programming language developed by Ericsson.  Files with
-the following extentions are recognized as Erlang files: erl, hrl, yaws.
+the following extensions are recognized as Erlang files: erl, hrl, yaws.
 
 The BIFs (built-in functions) are highlighted by default. To disable this,
 put the following line in your vimrc: >
@@ -2286,7 +2294,7 @@ For highlighting parent error ] or ): >
 
   let php_parent_error_close = 1
 
-For skipping an php end tag, if there exists an open ( or [ without a closing
+For skipping a php end tag, if there exists an open ( or [ without a closing
 one: >
 
   let php_parent_error_open = 1
diff --git a/runtime/doc/tags b/runtime/doc/tags
index df53a50bb..f02c4c296 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -657,6 +657,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'nottybuiltin'	options.txt	/*'nottybuiltin'*
 'nottyfast'	options.txt	/*'nottyfast'*
 'notx'	options.txt	/*'notx'*
+'noudf'	options.txt	/*'noudf'*
+'noundofile'	options.txt	/*'noundofile'*
 'novb'	options.txt	/*'novb'*
 'novice'	vi_diff.txt	/*'novice'*
 'novisualbell'	options.txt	/*'novisualbell'*
@@ -740,7 +742,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'readonly'	options.txt	/*'readonly'*
 'redraw'	vi_diff.txt	/*'redraw'*
 'redrawtime'	options.txt	/*'redrawtime'*
-'regexpengine''	options.txt	/*'regexpengine''*
+'regexpengine'	options.txt	/*'regexpengine'*
 'relativenumber'	options.txt	/*'relativenumber'*
 'remap'	options.txt	/*'remap'*
 'report'	options.txt	/*'report'*
@@ -5992,6 +5994,7 @@ g:tar_secure	pi_tar.txt	/*g:tar_secure*
 g:tar_writeoptions	pi_tar.txt	/*g:tar_writeoptions*
 g:tex_conceal	syntax.txt	/*g:tex_conceal*
 g:tex_fast	syntax.txt	/*g:tex_fast*
+g:tex_flavor	filetype.txt	/*g:tex_flavor*
 g:tex_isk	syntax.txt	/*g:tex_isk*
 g:var	eval.txt	/*g:var*
 g:vimball_home	pi_vimball.txt	/*g:vimball_home*
@@ -7342,7 +7345,12 @@ put-Visual-mode	change.txt	/*put-Visual-mode*
 py3eval()	eval.txt	/*py3eval()*
 pyeval()	eval.txt	/*pyeval()*
 python	if_pyth.txt	/*python*
+python-.locked	if_pyth.txt	/*python-.locked*
+python-Dictionary	if_pyth.txt	/*python-Dictionary*
+python-Function	if_pyth.txt	/*python-Function*
+python-List	if_pyth.txt	/*python-List*
 python-bindeval	if_pyth.txt	/*python-bindeval*
+python-bindeval-objects	if_pyth.txt	/*python-bindeval-objects*
 python-buffer	if_pyth.txt	/*python-buffer*
 python-buffers	if_pyth.txt	/*python-buffers*
 python-command	if_pyth.txt	/*python-command*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 5dd5798c9..e77fb55c5 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2013 May 21
+*todo.txt*      For Vim version 7.3.  Last change: 2013 Jun 01
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,15 +34,14 @@ not be repeated below, unless there is extra information.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Rename src/Makefile and create a new one like toplevel Makefile that creates
-auto/config.mk when it's not there? (Ben Schmidt, 2011 Feb 11)
-
 --- Python interface
 
-Python: thread with refactoring patches. (ZyX, May 19, 16:46 and later)
-9
-10
-11
+Patch from ZyX, May 30: Fix some possible memory problems
+
+Check: docs for .valid  patch by ZyX, May 30
+Correction by Roland Eggner, May 31.
+
+Tests are disabled because they fail.
 
 Configure doesn't find Python 3 on Ubuntu 13.04. (Ken Takata, Apr 13)
 
@@ -50,9 +49,7 @@ Python SystemExit exception is not handled properly.  Patch to catch the
 exception and give an error. (Yasuhiro Matsumoto)
 Does not work, tests fail.
 
-Patch to print the result of a :python command. (Maxim Philippov
-<philippovmi@gmail.com>, 2012 Aug 16)  Update Aug 17.
-Patch no longer applies.
+Patch to complete after :py3. (Taro Muraoka, 2013 May 31)
 
 ":python os.chdir('/tmp')" makes short buffer names invalid. (Xavier de Gaye)
 Patch to make os.chdir() handle side effects. (Xavier de Gaye, 2013 May 17)
@@ -71,7 +68,8 @@ Win32: The Python interface only works with one version of Python, selected at
 compile time.  Can this be made to work with version 2.1 and 2.2 dynamically?
 
 Python: Be able to define a Python function that can be called directly from
-Vim script.  Requires converting the arguments and return value.
+Vim script.  Requires converting the arguments and return value, like with
+vim.bindeval().
 
 --- runtime files
 
@@ -84,66 +82,60 @@ Claudio didn't respond yet.
 
 --- Fast regexp engine
 
-Duplicate condition in line 1094. (Ken Takata)  Should be 'r'?
-
-Multi-byte problem? Marc Weber
-    echo matchlist('1', '\%#=1\o{\?Ă\Z')
-    echo matchlist('1', '\%#=2\o{\?Ă\Z')
-
-Difference in matching this pattern: (Marc Weber)
-   echo matchlist("t", '\%#=1Ăş\Z')
-   echo matchlist("t", '\%#=2Ăş\Z')
+Error in HTML highlighting. (Hiroshi Shirosaki)
 
-Difference in matching this pattern:
-    echo matchlist('google', '\%#=1\<go*\|go')
-    echo matchlist('google', '\%#=2\<go*\|go')
+Tests for \{-} : Requires trying to start at every position?
+If so, rename nfa_has_backref to nfa_dup_states and re-use it for this.
 
-Difference in matching this pattern: (Marc Weber)
-  echo matchlist("\na", '\%#=1\_F')
-  echo matchlist("\na", '\%#=0\_F')
-  echo matchlist("\na", '\%#=2\_F')
+Allow "^*" as a literal "*".
 
-Don't set curbuf, use reg_buf.
+Need more testing for \1 back references.
 
-Estimation of number of items is wrong, can be much larger.
-When running out of space, retry with more space?
+Profiling:
+    ./vim -s ~/vim/test/loop.vim
+    ./vim -s ~/vim/test/xml.vim  (Fix: Uses the old engine, see
+				bt_regexp_debug.log)
+	Need \@<=
+	NFA engine could not handle "[<]\@<=[^ /!?<>"']\+"
+	NFA engine could not handle "<!--\_.\{-}-->"
 
-nfa_regcomp() should not use nstate_max but the actual number of states for
-allocating the prog?
+setting cpo_lit and cpo_bsl can be slow.  Make them global.
 
 Get example files for many languages. Compare syntax highlighting with old and
 new regexp, find regexp constructs where NFA does not work correctly.
 source ~/vim/regexp/runold.vim  to update the "old" files.
 source ~/vim/regexp/runnew.vim  to update the "new" files
 source ~/vim/regexp/diff.vim    to find differences
-Diffs in these files:
-- csh02: line 2, "13" is not highlighted after -misc-fixed-bold-r-normal-
-  as cshNumber
-- csh02: line 7, similar problem.
-- tst28.tex line 8 \alpha in texStatement instead of texGreek
+
+More test files from the src/pkg/regexp/testdata directory in the Go repo.
 
 It's very slow compared to the old engine...
 Performance tests:
+- ~/vim/text/FeiqCfg.xml (file from Netjune)
+- ~/vim/text/edl.svg  (also XML)
+- glts has five tests. (May 25)
 - ~/vim/test/veryslow.js  display last line (file from Daniel Fetchinson)
 - ~/vim/test/slowsearch
 - ~/vim/test/rgb.vim
-- ~/vim/text/FeiqCfg.xml (file from Netjune)
-- ~/vim/text/edl.svg  (also XML)
 - search for  a.*e*exn  in the vim executable.  Go to last line to use
   'hlsearch'.
 - Slow combination of folding and PHP syntax highlighting.  Script to
   reproduce it.  Caused by "syntax sync fromstart" in combination with patch
   7.2.274.  (Christian Brabandt, 2010 May 27) Generally, folding with
   'foldmethod' set to "syntax" is slow.  Do profiling to find out why.
-- Does not use any of the optimizations, such as required start pattern.
+- It does not use any of the optimizations, such as required start pattern.
 - When lists are empty in nfa_regmatch() and match is true, it keeps looping
   without doing anything.
 
-"\ze" is currently disabled for NFA, can this be fixed?
-
-"\_[0-9]\?\>" does not match at end of line, disabled.
-
-Items with \%u, \%x, \%o, \%d do not work with the new engine.
+Does not work (yet) with NFA:
+- \z() \z1 .. "\z9": Previously matched text in syn HL.
+- ~: previous substitute pattern. Requires recursive compilation?
+- \%u, \%x, \%o, \%d followed by a composing character
+- \%V Visual
+- \%[abc]
+- \%'  mark
+- \@<  match before zero-width
+- \@>  match whole pattern
 
 --- bug fixes
 
@@ -153,6 +145,8 @@ Patch to avoid wrong error message for 1.0[0]. (Yasuhiro Matsumoto, 2013 May
 Patch for if_lua. (Luis Carvalho, 2012 Aug 26, update Aug 29, another Aug 30,
 then Sep 1, reminder Oct 14)
 
+Patch for if_perl.  (Ike Devolder, May 27)
+
 Patch to check if 'foldexpr' sets did_emsg. (Christian Brabandt, 2013 Mar 20)
 
 Patch for 'backupcopy' default behavior for symlinks on Windows. (David Pope,
@@ -193,6 +187,9 @@ Another patch for MingW, 2012 Dec 29.
 Bug in completion menu. (Olivier Teuliere, 2013 Feb 15)
 Patch by Christian Brabandt, Feb 16.
 
+Issue 134: pasting in visual selection in empty buffer.
+Patch by Christian Brabandt, 2013 May 22.
+
 'cursorline' is drawn incorrectly in diff mode. Patch by Christian Brabandt,
 2012 Apr 2.
 
@@ -202,6 +199,9 @@ handle the out-of-memory and set them to sane values? (jimmywang, 2013 May 17)
 InsertEnter doesn't prevent the cursor from moving when it goes to another
 line.
 
+":diffoff" does not restore options from before starting diff mode.
+Patch by Christian Brabandt, 2013 May 26.
+
 --- slightly incompatible changes
 
 Patch to load ~/.vim/vimrc when ~/.vimrc isn't found. (Lech Lorens, 2013 Apr
@@ -216,6 +216,7 @@ the global mapping matches.  It is probably better to let the local mapping
 win and not wait. (discussion with Andy Wokula, 2013 Jan 30)
 Patch by Michael Henry, 2013 Jan 30, update Feb 15.
 
+Patch to store absolute path for cscope. (Christian Brabandt, 2013 May 31)
 
 ---- Fixes to be included before 7.4 above, less important stuff below ----
 
@@ -248,6 +249,10 @@ 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)
 
+Patch to support expression argument to sort() instead of a function name.
+Yasuhiro Matsumoto, 2013 May 31.
+Or should we add a more general mechanism, like lambda functions?
+
 Problem caused by patch 7.3.638: window->open does not update window
 correctly. Issue 91.
 
@@ -262,15 +267,15 @@ Patch to invert characters differently in GTK. (Yukihiro Nakadaira, 2013 May
 Patch to add the bufferlist() function. (Yegappan Lakshmanan, 2013 May 5)
 May 17: with winlist() and tabpagelist().
 May 19: with local variables.
-
-Patch to allow setting w:quickfix_title via setqflist() and setloclist()
-functions. (Christian Brabandt, 2013 May 8, update May 21)
+May 28: with options
 
 Patch to support 'u' in interactive substitute. (Christian Brabandt, 2012 Sep
 28)  With tests: Oct 9.
 
+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)
-Second one.
+Second one. Update May 22.
 
 Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
 
@@ -323,6 +328,10 @@ Patch to add functions for signs. (Christian Brabandt, 2013 Jan 27)
 Patch to use directX to draw text on Windows.  Adds the 'renderoptions'
 option.  (Taro Muraoka, 2013 Jan 25, update 2013 Apr 3, May 14)
 
+Patch to add 'completeselect' option.  Specifies how to select a candidate in
+insert completion. (Shougo, 2013 May 29)
+Update to add to existing 'completeopt'. 2013 May 30
+
 Problem with refresh:always in completion. (Tyler Wade, 2013 Mar 17)
 
 b:undo_ftplugin cannot call a script-local function. (Boris Danilov, 2013 Jan
@@ -408,6 +417,7 @@ And one for gui_x11.txt.
     Version for latest MacVim: Tobia Conforto, 2009 Nov 23
     More recent version: https://retracile.net/wiki/VimBreakIndent
     Posted to vim-dev by Taylor Hedberg, 2011 Nov 25
+    Update by Taylor Hedberg, 2013 May 30.
 
 ":cd" doesn't work when current directory path contains "**".
 finddir() has the same problem.  (Yukihiro Nakadaira, 2012 Jan 10)
@@ -1174,6 +1184,14 @@ Oct 19)  Check for "col" being "MAXCOL" separately?
 Unexpectedly inserting a double quote. (Anton Woellert, 2008 Mar 23)
 Works OK when 'cmdheight' is 2.
 
+8   Use a mechanism similar to omni completion to figure out the kind of tab
+    for CTRL-] and jump to the appropriate matching tag (if there are
+    several).
+    Alternative: be able to define a function that takes the tag name and uses
+    taglist() to find the right location.  With indication of using CTRL-] so
+    that the context can be taken into account. (Robert Webb)
+Patch by Christian Brabandt, 2013 May 31.
+
 Test54 should not use shell commands.  Make it portable.
 
 The utf class table is missing some entries:
@@ -3659,12 +3677,6 @@ Tags:
     make the filename or the whole option use |wildcards| globing, better
     would be to merge the 2 kinds of globing. originally (Erik Falor, 2008
     April 18), updated (Ian Kelling, 2008 July 4)
-8   Use a mechanism similar to omni completion to figure out the kind of tab
-    for CTRL-] and jump to the appropriate matching tag (if there are
-    several).
-    Alternative: be able to define a function that takes the tag name and uses
-    taglist() to find the right location.  With indication of using CTRL-] so
-    that the context can be taken into account. (Robert Webb)
 7   Can CTRL-] (jump to tag) include a following "." and "->" to restrict the
     number of possible matches? Check tags file for an item that has members.
     (Flemming Madsen)
diff --git a/runtime/doc/vim-fr.1 b/runtime/doc/vim-fr.1
index fcdae0d55..209ab915c 100644
--- a/runtime/doc/vim-fr.1
+++ b/runtime/doc/vim-fr.1
@@ -1,11 +1,11 @@
-.\" Traduction Lundi 7 aoűt 2000 par Richard Hitier
+.\" Traduction lundi 7 aoűt 2000 par Richard Hitier
 .\" (richard.hitier@dial.oleane.com)
 .\" Mise ŕ jour de la traduction par David Blanchet
 .\" (david.blanchet@free.fr) 2006-06-10
 .\" Mise ŕ jour de la traduction par Dominique Pellé
-.\" (dominique.pelle@gmail.com) 2008-11-29
+.\" (dominique.pelle@gmail.com) 2013-05-10
 .\"
-.TH VIM 1 "22 Février 2002"
+.TH VIM 1 "22 février 2002"
 .SH NOM
 vim \- Vi IMproved, éditeur de texte pour programmeurs
 .SH SYNOPSIS
@@ -156,7 +156,7 @@ Exécute {commande} aprčs la lecture du premier fichier.
 {commande} est interprétée comme une commande Ex.
 Si la {commande} contient des espaces, elle doit ętre entourée
 de doubles-apostrophes (cela dépend du shell utilisé).
-Exemple: Vim "+set si" main.c
+Exemple : Vim "+set si" main.c
 .br
 Note : vous pouvez utiliser jusqu'ŕ 10 commandes "+" ou "\-c".
 .TP
@@ -204,7 +204,7 @@ Fonctionne comme vimdiff(1).
 \-d {périph}
 Ouvre {périph} pour l'utiliser comme terminal.
 Uniquement sur Amiga.
-Exemple:
+Exemple :
 "\-d con:20/30/600/150".
 .TP
 \-D
@@ -269,7 +269,7 @@ quitte.
 Si
 .B Vim
 a été compilé avec le support de la fonctionnalité RIGHTLEFT pour l'édition de
-fichiers de droite ŕ gauche et les claviers hébreu, cette option lance
+fichiers de droite ŕ gauche et les claviers hébreux, cette option lance
 .B Vim
 en mode Hébreu, c.-ŕ-d. avec les options 'hkmap' et 'rightleft' activées.
 Sinon, un message d'erreur est émis et
@@ -435,7 +435,7 @@ Mode restreint. Fonctionne comme si l'exécutable commençait par la lettre 'r'.
 \-\-
 Délimite la fin des options.
 Les arguments qui suivent seront considérés comme des noms de fichiers.
-Cela permet d'éditer des fichier débutant par un '\-'.
+Cela permet d'éditer des fichiers débutant par un '\-'.
 .TP
 \-\-echo\-wid
 IHM graphique GTK uniquement : retourne la Window ID sur stdout.
@@ -586,4 +586,4 @@ Cette page de manuel a été traduite par Richard Hitier.
 .br
 Cette page de manuel a été mise ŕ jour par David Blanchet.
 <david.blanchet@free.fr> 2006-04-10.
-Mise ŕ jour 2012-05-06, Dominique Pellé <dominique.pelle@gmail.com>
+Mise ŕ jour 2013-05-10, Dominique Pellé <dominique.pelle@gmail.com>
diff --git a/runtime/doc/vim-fr.UTF-8.1 b/runtime/doc/vim-fr.UTF-8.1
index b1dcf76c6..4f20e3781 100644
--- a/runtime/doc/vim-fr.UTF-8.1
+++ b/runtime/doc/vim-fr.UTF-8.1
@@ -1,11 +1,11 @@
-.\" Traduction Lundi 7 aoĂťt 2000 par Richard Hitier
+.\" Traduction lundi 7 aoĂťt 2000 par Richard Hitier
 .\" (richard.hitier@dial.oleane.com)
 .\" Mise Ă  jour de la traduction par David Blanchet
 .\" (david.blanchet@free.fr) 2006-06-10
 .\" Mise Ă  jour de la traduction par Dominique PellĂŠ
-.\" (dominique.pelle@gmail.com) 2008-11-29
+.\" (dominique.pelle@gmail.com) 2013-05-10
 .\"
-.TH VIM 1 "22 FĂŠvrier 2002"
+.TH VIM 1 "22 fĂŠvrier 2002"
 .SH NOM
 vim \- Vi IMproved, ĂŠditeur de texte pour programmeurs
 .SH SYNOPSIS
@@ -156,7 +156,7 @@ ExĂŠcute {commande} aprĂ¨s la lecture du premier fichier.
 {commande} est interprĂŠtĂŠe comme une commande Ex.
 Si la {commande} contient des espaces, elle doit ĂŞtre entourĂŠe
 de doubles-apostrophes (cela dĂŠpend du shell utilisĂŠ).
-Exemple: Vim "+set si" main.c
+Exemple : Vim "+set si" main.c
 .br
 Note : vous pouvez utiliser jusqu'Ă  10 commandes "+" ou "\-c".
 .TP
@@ -204,7 +204,7 @@ Fonctionne comme vimdiff(1).
 \-d {pĂŠriph}
 Ouvre {pĂŠriph} pour l'utiliser comme terminal.
 Uniquement sur Amiga.
-Exemple:
+Exemple :
 "\-d con:20/30/600/150".
 .TP
 \-D
@@ -269,7 +269,7 @@ quitte.
 Si
 .B Vim
 a ĂŠtĂŠ compilĂŠ avec le support de la fonctionnalitĂŠ RIGHTLEFT pour l'ĂŠdition de
-fichiers de droite Ă  gauche et les claviers hĂŠbreu, cette option lance
+fichiers de droite Ă  gauche et les claviers hĂŠbreux, cette option lance
 .B Vim
 en mode HĂŠbreu, c.-Ă -d. avec les options 'hkmap' et 'rightleft' activĂŠes.
 Sinon, un message d'erreur est ĂŠmis et
@@ -435,7 +435,7 @@ Mode restreint. Fonctionne comme si l'exĂŠcutable commenĂ§ait par la lettre 'r'.
 \-\-
 DĂŠlimite la fin des options.
 Les arguments qui suivent seront considĂŠrĂŠs comme des noms de fichiers.
-Cela permet d'ĂŠditer des fichier dĂŠbutant par un '\-'.
+Cela permet d'ĂŠditer des fichiers dĂŠbutant par un '\-'.
 .TP
 \-\-echo\-wid
 IHM graphique GTK uniquement : retourne la Window ID sur stdout.
@@ -586,4 +586,4 @@ Cette page de manuel a ĂŠtĂŠ traduite par Richard Hitier.
 .br
 Cette page de manuel a ĂŠtĂŠ mise Ă  jour par David Blanchet.
 <david.blanchet@free.fr> 2006-04-10.
-Mise Ă  jour 2012-05-06, Dominique PellĂŠ <dominique.pelle@gmail.com>
+Mise Ă  jour par Dominique PellĂŠ <dominique.pelle@gmail.com> 2013-05-10
diff --git a/runtime/doc/xxd-fr.1 b/runtime/doc/xxd-fr.1
index 541880bd2..be780858b 100644
--- a/runtime/doc/xxd-fr.1
+++ b/runtime/doc/xxd-fr.1
@@ -159,7 +159,7 @@ fichier n'est pas adressable, seuls les vides sont autorisés, et ils seront
 comblés par des octets nuls.
 .PP
 .I xxd \-r
-ne génčre aucune erreur lors de l'analyse. Le problčme sont passés
+ne génčre aucune erreur lors de l'analyse. Les problčmes sont passés
 silencieusement.
 .PP
 Lors de l'édition de la représentation hexadécimale, veuillez noter que
@@ -307,7 +307,7 @@ Convertir le fichier de l'exemple précédent avec la fonctionnalité "autoskip".
 000fffc: 0000 0000 40                   ....A
 .PP
 Créer un fichier d'un octet, contenant seulement le caractčre 'A'.
-Les nombres aprčs '\-r \-s' s'ajoutent au numéros de lignes trouvées dans le
+Le nombre aprčs '\-r \-s' s'ajoute aux numéros de lignes trouvées dans le
 fichier ; les octets initiaux sont supprimés.
 .br
 \fI% echo '010000: 41' | xxd \-r \-s \-0x10000 \> fichier\fR
@@ -393,4 +393,4 @@ Modifications mineures par Bram Moolenaar.
 .SH TRADUCTION
 Cette page de manuel a été traduite par David Blanchet
 <david.blanchet@free.fr> 2004-12-24.
-Mise ŕ jour 2012-05-06, Dominique Pellé <dominique.pelle@gmail.com>
+Mise ŕ jour 2013-05-10, Dominique Pellé <dominique.pelle@gmail.com>
diff --git a/runtime/doc/xxd-fr.UTF-8.1 b/runtime/doc/xxd-fr.UTF-8.1
index 84a84291f..7956b3ba2 100644
--- a/runtime/doc/xxd-fr.UTF-8.1
+++ b/runtime/doc/xxd-fr.UTF-8.1
@@ -159,7 +159,7 @@ fichier n'est pas adressable, seuls les vides sont autorisĂŠs, et ils seront
 comblĂŠs par des octets nuls.
 .PP
 .I xxd \-r
-ne gĂŠnĂ¨re aucune erreur lors de l'analyse. Le problĂ¨me sont passĂŠs
+ne gĂŠnĂ¨re aucune erreur lors de l'analyse. Les problĂ¨mes sont passĂŠs
 silencieusement.
 .PP
 Lors de l'ĂŠdition de la reprĂŠsentation hexadĂŠcimale, veuillez noter que
@@ -307,7 +307,7 @@ Convertir le fichier de l'exemple prĂŠcĂŠdent avec la fonctionnalitĂŠ "autoskip"
 000fffc: 0000 0000 40                   ....A
 .PP
 CrĂŠer un fichier d'un octet, contenant seulement le caractĂ¨re 'A'.
-Les nombres aprĂ¨s '\-r \-s' s'ajoutent au numĂŠros de lignes trouvĂŠes dans le
+Le nombre aprĂ¨s '\-r \-s' s'ajoute aux numĂŠros de lignes trouvĂŠes dans le
 fichier ; les octets initiaux sont supprimĂŠs.
 .br
 \fI% echo '010000: 41' | xxd \-r \-s \-0x10000 \> fichier\fR
@@ -393,4 +393,4 @@ Modifications mineures par Bram Moolenaar.
 .SH TRADUCTION
 Cette page de manuel a ĂŠtĂŠ traduite par David Blanchet
 <david.blanchet@free.fr> 2004-12-24.
-Mise Ă  jour 2012-05-06, Dominique PellĂŠ <dominique.pelle@gmail.com>
+Mise Ă  jour 2013-05-10, Dominique PellĂŠ <dominique.pelle@gmail.com>