From 32efaf6154071c21ff975429ae74e507b93311b1 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 5 Nov 2014 17:02:17 +0100
Subject: [PATCH] Update runtime files.

---
 runtime/autoload/gzip.vim   |  8 +++--
 runtime/doc/diff.txt        | 16 +++++----
 runtime/doc/options.txt     |  7 ++--
 runtime/doc/quickref.txt    |  9 +++--
 runtime/doc/repeat.txt      |  5 ++-
 runtime/doc/tags            |  1 +
 runtime/doc/todo.txt        | 66 ++++++++++++++++++++++++-------------
 runtime/doc/usr_25.txt      |  4 +--
 runtime/filetype.vim        |  5 ++-
 runtime/syntax/registry.vim | 11 ++++---
 10 files changed, 89 insertions(+), 43 deletions(-)

diff --git a/runtime/autoload/gzip.vim b/runtime/autoload/gzip.vim
index 1245fdddc..a6b4605b0 100644
--- a/runtime/autoload/gzip.vim
+++ b/runtime/autoload/gzip.vim
@@ -1,6 +1,6 @@
 " Vim autoload file for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2008 Jul 04
+" Last Change: 2014 Nov 05
 
 " These functions are used by the gzip plugin.
 
@@ -120,6 +120,8 @@ fun gzip#read(cmd)
     silent! exe "bwipe " . tmp_esc
     silent! exe "bwipe " . tmpe_esc
   endif
+  " Store the OK flag, so that we can use it when writing.
+  let b:uncompressOk = ok
 
   " Restore saved option values.
   let &pm = pm_save
@@ -146,8 +148,10 @@ endfun
 
 " After writing compressed file: Compress written file with "cmd"
 fun gzip#write(cmd)
+  if exists('b:uncompressOk') && !b:uncompressOk
+    echomsg "Not compressing file because uncompress failed; reset b:uncompressOk to compress anyway"
   " don't do anything if the cmd is not supported
-  if s:check(a:cmd)
+  elseif s:check(a:cmd)
     " Rename the file before compressing it.
     let nm = resolve(expand("<afile>"))
     let nmt = s:tempname(nm)
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 0ee587834..be17b0c73 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.4.  Last change: 2014 May 20
+*diff.txt*      For Vim version 7.4.  Last change: 2014 Oct 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -266,13 +266,17 @@ that the buffers will be equal within the specified range.
 		See below for [range].
 
 							*do*
-do		Same as ":diffget" without argument or range.  The "o" stands
-		for "obtain" ("dg" can't be used, it could be the start of
-		"dgg"!). Note: this doesn't work in Visual mode.
+[count]do	Same as ":diffget" without range.  The "o" stands for "obtain"
+		("dg" can't be used, it could be the start of "dgg"!). Note:
+		this doesn't work in Visual mode.
+		If you give a [count], it is used as the [bufspec] argument
+		for ":diffget".
 
 							*dp*
-dp		Same as ":diffput" without argument or range.
-		Note: this doesn't work in Visual mode.
+[count]dp	Same as ":diffput" without range.  Note: this doesn't work in
+		Visual mode.
+		If you give a [count], it is used as the [bufspec] argument
+		for ":diffput".
 
 
 When no [range] is given, the diff at the cursor position or just above it is
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 534ef449f..ccf92991f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.4.  Last change: 2014 Sep 23
+*options.txt*	For Vim version 7.4.  Last change: 2014 Nov 05
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2221,7 +2221,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 
 						*'cryptmethod'* *'cm'*
-'cryptmethod'		string	(default "zip")
+'cryptmethod' 'cm'	string	(default "zip")
 			global or local to buffer |global-local|
 			{not in Vi}
 	Method used for encryption when the buffer is written to a file:
@@ -7748,6 +7748,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	current buffer: >
 		setlocal ul=-1
 <	This helps when you run out of memory for a single change.
+
+	The local value is set to -123456 when the global value is to be used.
+
 	Also see |clear-undo|.
 
 						*'undoreload'* *'ur'*
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 096921f00..727f6ac4b 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.4.  Last change: 2014 Aug 06
+*quickref.txt*  For Vim version 7.4.  Last change: 2014 Oct 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1313,11 +1313,16 @@ Context-sensitive completion on the command-line:
 |CTRL-W_R|	CTRL-W R		rotate windows upwards
 |CTRL-W_x|	CTRL-W x		exchange current window with next one
 
-|CTRL-W_=|	CTRL-W =		make all windows equal height
+|CTRL-W_=|	CTRL-W =		make all windows equal height & width
 |CTRL-W_-|	CTRL-W -		decrease current window height
 |CTRL-W_+|	CTRL-W +		increase current window height
 |CTRL-W__|	CTRL-W _		set current window height (default:
 					   very high)
+
+|CTRL-W_<|	CTRL-W <		decrease current window width
+|CTRL-W_>|	CTRL-W >		increase current window width
+|CTRL-W_bar|	CTRL-W |		set current window width (default:
+					   widest possible)
 ------------------------------------------------------------------------------
 *Q_bu*		Buffer list commands
 
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 4b28e8617..edeef6655 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.4.  Last change: 2014 Mar 25
+*repeat.txt*    For Vim version 7.4.  Last change: 2014 Oct 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -64,6 +64,9 @@ replacement string.
 
 For the definition of a pattern, see |pattern|.
 
+NOTE [cmd] may contain a range; see |collapse| and |edit-paragraph-join| for
+examples.
+
 The global commands work by first scanning through the [range] lines and
 marking each line where a match occurs (for a multi-line pattern, only the
 start of the match matters).
diff --git a/runtime/doc/tags b/runtime/doc/tags
index f8db6553e..460be9044 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5473,6 +5473,7 @@ edit-dialogs	editing.txt	/*edit-dialogs*
 edit-files	editing.txt	/*edit-files*
 edit-intro	editing.txt	/*edit-intro*
 edit-no-break	usr_25.txt	/*edit-no-break*
+edit-paragraph-join	usr_25.txt	/*edit-paragraph-join*
 editing.txt	editing.txt	/*editing.txt*
 efm-%>	quickfix.txt	/*efm-%>*
 efm-entries	quickfix.txt	/*efm-entries*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index daf5270e5..32b1f901c 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2014 Oct 15
+*todo.txt*      For Vim version 7.4.  Last change: 2014 Nov 05
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -44,6 +44,7 @@ Regexp problems:
   2013 Dec 11)
 - Using \@> and \?. (Brett Stahlman, 2013 Dec 21) Remark from Marcin Szamotulski
   Remark from Brett 2014 Jan 6 and 7.
+- Difference in NFA and old engine. (Brett Stahlman, 2014 Nov 5)
 - Bug when using \>. (Ramel, 2014 Feb 2) (Aaron Bohannon, 2014 Feb 13)
 - NFA regexp doesn't handle \%<v correctly. (Ingo Karkat, 2014 May 12)
 - Does not work with NFA regexp engine:
@@ -63,10 +64,6 @@ Breaks test_eval.  Inefficient, can we only compute y_width when needed?
 Problem that a previous silent ":throw" causes a following try/catch not to
 work. (ZyX, 2013 Sep 28)
 
-Patch to avoid problems with encoding conversion with diff.vim.
-(Yasuhiro Matsumoto, 2014 Sep 1.
-Depends on current language, language of file can be different.
-
 ":cd C:\Windows\System32\drivers\etc*" does not work, even though the
 directory exists. (Sergio Gallelli, 2013 Dec 29)
 
@@ -77,31 +74,26 @@ Patch by Marcin Szamotulski to add count to :close (2014 Aug 10, update Aug
     Make ":-1close" close the previous window.
 Doesn't look right, asked for updates.
 
+C macro with number highlighted wrong. (Dominique Pelle, 2014 Oct 23)
+
 The entries added by matchaddpos() are returned by getmatches() but can't be
 set with setmatches(). (lcd47, 2014 Jun 29)
 
-Patch to fix that 0x80 in abbreviation isn't handled correctly.
-(Christian Brabandt, 2014 Oct 1)
-
-Check for valid yank reg seems wrong.  Patch by Zyx, 2014 Oct 12.
-
-":sign-jump" uses first window in buffer instead of current window.
-Patch by James McCoy, 2013 Nov 22.  Update 2014 Oct 5.
-
-Patch to fix issue 57, on the issue.
-
-Patch for issue 101, maintainer unreachable.
-
 Gvim: when both Tab and CTRL-I are mapped, use CTRL-I not for Tab.
 
-Patch to fix that last_changedtick is not update on saving. (Christian
-Brabandt, 2014 Oct 10, second one)
+Patch to add 'langnoremap'. (Christian Brabandt, 2014 Oct 15)
+Update Oct 20.
 
-substitute() can be slow with long strings.  Patch by Ozaki Kiichi, 2014 Oct
-12.
+Patch to add append mode to writefile(). (Yasuhiro Matsumoto, 2014 Nov 1)
 
 Remove restriction in NSIS installer that the end of the path must be "Vim".
-(Tim Lebedkov, 2014 Sep 24) Again Oct 12.
+(Tim Lebedkov, 2014 Sep 24) Again Oct 12.  Now on issue 272.
+
+Fix that on MS-Windows MAX_PATH in bytes causes problems for file names
+between MAX_PATH and double that for double-byte encodings. (Ken Takata, 2014
+Oct 15)
+
+Another problem with MAX_PATH, off-by-one. (Ken Takata, 2014 Oct 21)
 
 Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
 
@@ -117,11 +109,16 @@ Patch to fix issue 78. (Christian Brabandt, 2014 Oct 8)
 
 Patch to fix leak in map() with error. (Christian Brabandt, 2014 Oct 11)
 
+Patch to fix incsearch for "2/pattern/e".
+
+Change behavior of v:hlsearch?  Patch from Christian, 2014 Oct 22.
+
 Value returned by virtcol() changes depending on how lines wrap.  This is
 inconsistent with the documentation.
 
 On MS-Windows running tests with Mercurial has problems when the input files
 are changed. (Ken Takata, Taro Muraoka, 2014 Sep 25)
+Update Nov 5.
 
 MS-Windows: Crash opening very long file name starting with "\\".
 (Christian Brock, 2012 Jun 29)
@@ -129,6 +126,9 @@ MS-Windows: Crash opening very long file name starting with "\\".
 ml_updatechunk() is slow when retrying for another encoding. (John Little,
 2014 Sep 11)
 
+When 'balloonexpr' returns a list the result has a trailing newline.
+Just remove one trailing newline. (lcd, 2014 Oct 17)
+
 Make comments in the test Makefile silent. (Kartik Agaram, 2014 Sep 24)
 
 When in 'comments' "n:x" follows after three-part comment directly it repeats
@@ -136,8 +136,16 @@ any one-character from the previous line. (Kartik Agaram, 2014 Sep 19)
 
 Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21)
 
+Patch to add the EndOfBuffer highlight group, used instead of NonText for "~"
+lines. (Marco Hinz, 2014 Nov 2)
+
 Adding "~" to 'cdpath' doesn't work for completion?  (Davido, 2013 Aug 19)
 
+Can assign to s:type when a function s:type has been defined.
+Also the other way around: define a function while a variable with that name
+was already defined.
+(Yasuhiro Matsumoto, 2014 Nov 3)
+
 Patch to make closed folds line up. (Charles Campbell, 2014 Sep 12)
 
 Patch for building a 32bit Vim with 64bit MingW compiler.
@@ -145,6 +153,11 @@ Patch for building a 32bit Vim with 64bit MingW compiler.
 
 Delete old code in os_msdos.c, mch_FullName().
 
+Using "." to repeat an Ex command puts that command in history.  Probably
+should not happen.  If the command is the result of a mapping it's not put in
+history either. (Jacob Niehus, 2014 Nov 2)
+Patch from Jacob, Nov 2.
+
 "hi link" does not respect groups with GUI settings only. (Mark Lodato, 2014
 Jun 8)
 
@@ -183,6 +196,8 @@ its height?  It's like dragging the status bar above it at the same time.
 Can we make ":unlet $VAR" use unsetenv() to delete the env var?
 What for systems that don't have unsetenv()?
 
+Patch to add a :domodeline command. (Christian Brabandt, 2014 Oct 21)
+
 This does not give an error: (Andre Sihera, 2014 Mar 21)
     vim -u NONE 1 2 3 -c 'bufdo if 1 | echo 1'
 This neither: (ZyX)
@@ -635,6 +650,9 @@ Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2,
 only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug
 21, Ben Fritz, 2010 Sep 14)
 
+The :syntax cchar value can only be a single character.  It would be useful to
+support combining characters. (Charles Campbell)
+
 'cursorline' works on a text line only.  Add 'cursorscreenline' for
 highlighting the screen line. (Christian Brabandt, 2012 Mar 31)
 
@@ -759,6 +777,10 @@ Need for CursorHold that retriggers.  Use a key that doesn't do anything, or a
 function that resets did_cursorhold.
 Patch by Christian Brabandt, 2011 May 6.
 
+Add event for when the text scrolls.  A bit like CursorMoved.  Also a similar
+one for insert mode.  Use the event in matchparen to update the highlight if
+the match scrolls into view.
+
 7   Use "++--", "+++--" for different levels instead of "+---" "+----".
 Patch by Christian Brabandt, 2011 Jul 27.
 Update by Ben Fritz, with fix for TOhtml. (2011 Jul 30)
diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt
index 5a687599b..23d76a8b0 100644
--- a/runtime/doc/usr_25.txt
+++ b/runtime/doc/usr_25.txt
@@ -1,4 +1,4 @@
-*usr_25.txt*	For Vim version 7.4.  Last change: 2007 May 11
+*usr_25.txt*	For Vim version 7.4.  Last change: 2014 Oct 29
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -402,7 +402,7 @@ the cursor keys: >
 	:map <Down> gj
 
 
-TURNING A PARAGRAPH INTO ONE LINE
+TURNING A PARAGRAPH INTO ONE LINE			*edit-paragraph-join*
 
 If you want to import text into a program like MS-Word, each paragraph should
 be a single line.  If your paragraphs are currently separated with empty
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 67d167453..508f19820 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:	2014 Oct 09
+" Last Change:	2014 Nov 05
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -782,6 +782,9 @@ au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
 au BufNewFile,BufRead *.git/modules/*/COMMIT_EDITMSG setf gitcommit
 au BufNewFile,BufRead *.git/modules/*/config	setf gitconfig
 au BufNewFile,BufRead */.config/git/config	setf gitconfig
+if !empty($XDG_CONFIG_HOME)
+  au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config	setf gitconfig
+endif
 au BufNewFile,BufRead git-rebase-todo		setf gitrebase
 au BufNewFile,BufRead .msg.[0-9]*
       \ if getline(1) =~ '^From.*# This line is ignored.$' |
diff --git a/runtime/syntax/registry.vim b/runtime/syntax/registry.vim
index e9ff8fcab..4524247a0 100644
--- a/runtime/syntax/registry.vim
+++ b/runtime/syntax/registry.vim
@@ -1,8 +1,9 @@
 " Vim syntax file
 " Language:	Windows Registry export with regedit (*.reg)
-" Maintainer:	Dominique Stéphan (dominique@mggen.com)
-" URL: http://www.mggen.com/vim/syntax/registry.zip
-" Last change:	2004 Apr 23
+" Maintainer:	Dominique Stéphan (dominique@mggen.com)
+" URL: 		http://www.mggen.com/vim/syntax/registry.zip (doesn't work)
+" Last change:	2014 Oct 31
+"		Included patch from Alexander A. Ulitin
 
 " clear any unwanted syntax defs
 " For version 5.x: Clear all syntax items
@@ -17,7 +18,7 @@ endif
 syn case ignore
 
 " Head of regedit .reg files, it's REGEDIT4 on Win9#/NT
-syn match registryHead		"^REGEDIT[0-9]*$"
+syn match registryHead		"^REGEDIT[0-9]*\s*$\|^Windows Registry Editor Version \d*\.\d*\s*$"
 
 " Comment
 syn match  registryComment	"^;.*$"
@@ -58,7 +59,7 @@ syn region registryRemove	start="\[\-" end="\]" contains=registryHKEY,registryGU
 " Subkey
 syn match  registrySubKey		"^\".*\"="
 " Default value
-syn match  registrySubKey		"^\@="
+syn match  registrySubKey		"^@="
 
 " Numbers
 
-- 
2.40.0