Merge pull request #3860 from justinmk/vim-0122c40

vim-patch:0122c40

runtime/doc/change.txt

@@ -1063,11 +1063,12 @@ There are nine types of registers:			*registers* *E354*
 2. 10 numbered registers "0 to "9
 3. The small delete register "-
 4. 26 named registers "a to "z or "A to "Z
-5. four read-only registers ":, "., "% and "#
+5. three read-only registers ":, "., "%
-6. the expression register "=
+6. alternate buffer register "#
-7. The selection and drop registers "*, "+ and "~ 
+7. the expression register "=
-8. The black hole register "_
+8. The selection and drop registers "*, "+ and "~ 
-9. Last search pattern register "/
+9. The black hole register "_
+10. Last search pattern register "/
 
 1. Unnamed register ""				*quote_quote* *quotequote*
 Vim fills this register with text deleted with the "d", "c", "s", "x" commands

runtime/doc/diff.txt

@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.4.  Last change: 2015 Jan 19
+*diff.txt*      For Vim version 7.4.  Last change: 2015 Feb 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -306,6 +306,19 @@ name or a part of a buffer name.  Examples:
 
 Also see |'diffopt'| and the "diff" item of |'fillchars'|.
 
+					    *diff-slow* *diff_translations*
+For very long lines, the diff syntax highlighting might be slow, especially
+since it tries to match all different kind of localisations. To disable
+localisations and speed up the syntax highlighting, set the global variable
+g:diff_translations to zero: >
+
+    let g:diff_translations = 0
+<
+After setting this variable, Reload the syntax script: >
+
+    set syntax=diff
+<
+
 
 FINDING THE DIFFERENCES					*diff-diffexpr*
 

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.4.  Last change: 2014 Nov 27
+*eval.txt*	For Vim version 7.4.  Last change: 2015 Jan 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4972,6 +4972,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 		s	The text of the String argument is used.  If a
 			precision is specified, no more bytes than the number
 			specified are used.
+							*printf-S*
 		S	The text of the String argument is used.  If a
 			precision is specified, no more display cells than the
 			number specified are used.  Without the |+multi_byte|

runtime/doc/options.txt

@@ -1194,6 +1194,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	nofile only:	The buffer name is fixed, it is not handled like a
 			file name.  It is not modified in response to a |:cd|
 			command.
+	nofile only:	When using ":e bufname" and already editing "bufname"
+			nothing changes, since there is no file to edit.
 							*E676*
 	"acwrite" implies that the buffer name is not related to a file, like
 	"nofile", but it will be written.  Thus, in contrast to "nofile" and

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.4.  Last change: 2015 Jan 07
+*syntax.txt*	For Vim version 7.4.  Last change: 2015 Feb 03
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1130,6 +1130,8 @@ there are very long lines in the file.  To disable translations: >
 
 	:let diff_translations = 0
 
+Also see |diff-slow|.
+
 
 DIRCOLORS			       *dircolors.vim* *ft-dircolors-syntax*
 

runtime/doc/windows.txt

@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 7.4.  Last change: 2014 Dec 05
+*windows.txt*   For Vim version 7.4.  Last change: 2015 Jan 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -984,8 +984,8 @@ list of buffers. |unlisted-buffer|
 		(the term "unlisted" is a bit confusing then...).
 
 		Each buffer has a unique number.  That number will not change,
-		so you can always go to a specific buffer with ":buffer N" or
+		thus you can always go to a specific buffer with ":buffer N"
-		"N CTRL-^", where N is the buffer number.
+		or "N CTRL-^", where N is the buffer number.
 
 		Indicators (chars in the same column are mutually exclusive):
 		u	an unlisted buffer (only displayed when [!] is used)

runtime/syntax/diff.vim

@@ -2,7 +2,7 @@
 " Language:	Diff (context or unified)
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
 "               Translations by Jakson Alves de Aquino.
-" Last Change:	2015 Jan 07
+" Last Change:	2015 Feb 03
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -123,13 +123,17 @@ 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	"^.*-ב קר אצמנ .*"
+" ^.* are expansive patterns for long lines, so disabled unless we can match
-syn match diffIdentical	"^םיהז םניה .*-ו .* םיצבקה$"
+" some specific hebrew chars
-syn match diffDiffer	"^הזמ הז םינוש `.*'-ו `.*' םיצבקה$"
+if search('\%u05d5\|\%u05d1', 'nw', '', 100)
-syn match diffBDiffer	"^הזמ הז םינוש `.*'-ו `.*' םיירניב םיצבק$"
+  syn match diffOnly	"^.*-ב קר אצמנ .*"
-syn match diffIsA	"^.* .*-ל .* .* תוושהל ןתינ אל$"
+  syn match diffIdentical	"^םיהז םניה .*-ו .* םיצבקה$"
-syn match diffNoEOL	"^\\ ץבוקה ףוסב השד.-הרוש ות רס."
+  syn match diffDiffer	"^הזמ הז םינוש `.*'-ו `.*' םיצבקה$"
-syn match diffCommon	"^.*-ו .* :תוהז תויקית-תת$"
+  syn match diffBDiffer	"^הזמ הז םינוש `.*'-ו `.*' םיירניב םיצבק$"
+  syn match diffIsA	"^.* .*-ל .* .* תוושהל ןתינ אל$"
+  syn match diffNoEOL	"^\\ ץבוקה ףוסב השד.-הרוש ות רס."
+  syn match diffCommon	"^.*-ו .* :תוהז תויקית-תת$"
+endif
 
 " hr
 syn match diffOnly	"^Samo u .*"

runtime/syntax/valgrind.vim

@@ -2,7 +2,8 @@
 " Language: Valgrind Memory Debugger Output
 " Maintainer: Roger Luethi <rl@hellgate.ch>
 " Program URL: http://devel-home.kde.org/~sewardj/
-" Last Change: 2014 Oct 02
+" Last Change: 2015 Jan 27
+" 		Included improvement by Dominique Pelle
 "
 " Notes: mostly based on strace.vim and xml.vim
 "
@@ -15,6 +16,9 @@ endif
 let s:keepcpo= &cpo
 set cpo&vim
 
+" Lines can be long with demangled c++ functions.
+setlocal synmaxcol=8000
+
 syn case match
 syn sync minlines=50
 
@@ -29,8 +33,8 @@ syn region valgrindRegion
 	\ contains=valgrindPidChunk,valgrindLine
 
 syn region valgrindPidChunk
-	\ start=+\(^==\)\@<=+
+	\ start=+^==\zs+
-	\ end=+\(==\)\@=+
+	\ end=+\ze==+
 	\ contained
 	\ contains=valgrindPid0,valgrindPid1,valgrindPid2,valgrindPid3,valgrindPid4,valgrindPid5,valgrindPid6,valgrindPid7,valgrindPid8,valgrindPid9
 	\ keepend
@@ -64,10 +68,11 @@ syn match valgrindSummary ".*SUMMARY:" contained
 syn match valgrindLoc "\s\+\(by\|at\|Address\).*$" contained
 	\ contains=valgrindAt,valgrindAddr,valgrindFunc,valgrindBin,valgrindSrc
 syn match valgrindAt "at\s\@=" contained
-syn match valgrindAddr "\(\W\)\@<=0x\x\+" contained
+syn match valgrindAddr "\W\zs0x\x\+" contained
-syn match valgrindFunc "\(: \)\@<=\w\+" contained
+
-syn match valgrindBin "\((\(with\|\)in \)\@<=\S\+\()\)\@=" contained
+syn match valgrindFunc ": \zs\h[a-zA-Z0-9_:\[\]()<>&*+\-,=%!|^ ]*\ze([^)]*)$" contained
-syn match valgrindSrc "\((\)\@<=[^)]*:\d\+\()\)\@=" contained
+syn match valgrindBin "(\(with\)\=in \zs\S\+)\@=" contained
+syn match valgrindSrc "(\zs[^)]*:\d\+)\@=" contained
 
 " Define the default highlighting