vim-patch:589edb340454

Updte runtime files
589edb3404

Omit state() changes in eval.txt because patch v8.1.2047 is not merged.

runtime/doc/options.txt

@@ -6713,8 +6713,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	":map <BS> X" to make backspace delete the character in front of the
 	cursor.
 	When 'l' is included and it is used after an operator at the end of a
-	line then it will not move to the next line.  This makes "dl", "cl",
+	line (not an empty line) then it will not move to the next line.  This
-	"yl" etc. work normally.
+	makes "dl", "cl", "yl" etc. work normally.
 
 						*'wildchar'* *'wc'*
 'wildchar' 'wc'		number	(Vim default: <Tab>, Vi default: CTRL-E)

runtime/doc/repeat.txt

@@ -206,10 +206,10 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 
 			When {file} contains wildcards it is expanded to all
 			matching files.  Example: >
-				:runtime! plugin/*.vim
+				:runtime! plugin/**/*.vim
 <			This is what Vim uses to load the plugin files when
 			starting up.  This similar command: >
-				:runtime plugin/*.vim
+				:runtime plugin/**/*.vim
 <			would source the first file only.
 
 			When 'verbose' is one or higher, there is a message

runtime/doc/syntax.txt

@@ -1892,6 +1892,16 @@ displayed line.  The default value is 10.  The disadvantage of using a larger
 number is that redrawing can become slow.
 
 
+JSON						*json.vim* *ft-json-syntax*
+
+The json syntax file provides syntax highlighting with conceal support by
+default. To disable concealment: >
+	let g:vim_json_conceal = 0
+
+To disable syntax highlighting of errors: >
+	let g:vim_json_warnings = 0
+
+
 LACE						*lace.vim* *ft-lace-syntax*
 
 Lace (Language for Assembly of Classes in Eiffel) is case insensitive, but the

runtime/pack/dist/opt/termdebug/plugin/termdebug.vim

@@ -552,9 +552,14 @@ func s:DecodeMessage(quotedText)
     if a:quotedText[i] == '\'
       let i += 1
       if a:quotedText[i] == 'n'
-        " drop \n
+	" drop \n
-        let i += 1
+	let i += 1
-        continue
+	continue
+      elseif a:quotedText[i] == 't'
+	" append \t
+	let i += 1
+	let result .= "\t"
+	continue
       endif
     endif
     let result .= a:quotedText[i]
@@ -715,12 +720,22 @@ func s:CommOutput(job_id, msgs, event)
       endif
     endif
   endfor
+endfunc
+
+func s:GotoProgram()
+  if has('win32')
+    if executable('powershell')
+      call system(printf('powershell -Command "add-type -AssemblyName microsoft.VisualBasic;[Microsoft.VisualBasic.Interaction]::AppActivate(%d);"', s:pid))
+    endif
+  else
+    win_gotoid(s:ptywin)
+  endif
 endfunc
 
 " Install commands in the current window to control the debugger.
 func s:InstallCommands()
   let save_cpo = &cpo
-  set cpo&vim
+  set cpo&vim
 
   command -nargs=? Break call s:SetBreakpoint(<q-args>)
   command Clear call s:ClearBreakpoint()
@@ -738,7 +753,7 @@ func s:InstallCommands()
     command Continue call chansend(s:gdb_job_id, "continue\r")
   endif
 
-  command -range -nargs=* Evaluate call s:Evaluate(<range>, <q-args>)
+  command -range -nargs=* Evaluate call s:Evaluate(<range>, <q-args>)
   command Gdb call win_gotoid(s:gdbwin)
   command Program call s:GotoProgram()
   command Source call s:GotoSourcewinOrCreateIt()
@@ -801,7 +816,7 @@ func s:DeleteCommands()
   endfor
   let s:BreakpointSigns = []
 endfunc
-
+
 " :Break - Set a breakpoint at the cursor position.
 func s:SetBreakpoint(at)
   " Setting a breakpoint may not work while the program is running.
@@ -814,9 +829,11 @@ func s:SetBreakpoint()
     else
       call s:SendCommand('-exec-interrupt')
     endif
+    sleep 10m
   endif
-  endif
+
-  " Use the fname:lnum format, older gdb can't handle --source.
+  " Use the fname:lnum format, older gdb can't handle --source.
+  let at = empty(a:at) ?
         \ fnameescape(expand('%:p')) . ':' . line('.') : a:at
   call s:SendCommand('-break-insert ' . at)
   if do_continue
@@ -831,14 +848,14 @@ func s:ClearBreakpoint()
   let bploc = printf('%s:%d', fname, lnum)
   if has_key(s:breakpoint_locations, bploc)
     let idx = 0
-    for id in s:breakpoint_locations[bploc]
+    for id in s:breakpoint_locations[bploc]
-      if has_key(s:breakpoints, id)
+      if has_key(s:breakpoints, id)
-        " Assume this always works, the reply is simply "^done".
+	" Assume this always works, the reply is simply "^done".
-        call s:SendCommand('-break-delete ' . id)
+	call s:SendCommand('-break-delete ' . id)
-        for subid in keys(s:breakpoints[id])
+	for subid in keys(s:breakpoints[id])
-          exe 'sign unplace ' . s:Breakpoint2SignNumber(id, subid)
+	  exe 'sign unplace ' . s:Breakpoint2SignNumber(id, subid)
-        endfor
+	endfor
-        unlet s:breakpoints[id]
+	unlet s:breakpoints[id]
 	unlet s:breakpoint_locations[bploc][idx]
 	break
       else
@@ -1242,8 +1259,8 @@ func s:HandleBreakpointDelete(msg)
   if empty(id)
     return
   endif
-  if has_key(s:breakpoints, id)
+  if has_key(s:breakpoints, id)
-    for [subid, entry] in items(s:breakpoints[id])
+    for [subid, entry] in items(s:breakpoints[id])
       if has_key(entry, 'placed')
 	exe 'sign unplace ' . s:Breakpoint2SignNumber(id, subid)
 	unlet entry['placed']
@@ -1267,7 +1284,7 @@ func s:BufRead()
 " Handle a BufRead autocommand event: place any signs.
 func s:BufRead()
   let fname = expand('<afile>:p')
-  for [id, entries] in items(s:breakpoints)
+  for [id, entries] in items(s:breakpoints)
     for [subid, entry] in items(entries)
       if entry['fname'] == fname
 	call s:PlaceSign(id, subid, entry)
@@ -1279,7 +1296,7 @@ func s:BufUnloaded()
 " Handle a BufUnloaded autocommand event: unplace any signs.
 func s:BufUnloaded()
   let fname = expand('<afile>:p')
-  for [id, entries] in items(s:breakpoints)
+  for [id, entries] in items(s:breakpoints)
     for [subid, entry] in items(entries)
       if entry['fname'] == fname
 	let entry['placed'] = 0

runtime/plugin/netrwPlugin.vim

@@ -81,7 +81,7 @@ if !exists("g:netrw_nogx")
   if !hasmapto('<Plug>NetrwBrowseX')
    nmap <unique> gx <Plug>NetrwBrowseX
   endif
-  nno <silent> <Plug>NetrwBrowseX :call netrw#BrowseX(netrw#GX(),netrw#CheckIfRemote(netrw#GX()))<cr>
+  nno <silent> <Plug>NetrwBrowseX :call netrw#BrowseX(expand((exists("g:netrw_gx")? g:netrw_gx : '<cfile>')),netrw#CheckIfRemote())<cr>
  endif
  if maparg('gx','v') == ""
   if !hasmapto('<Plug>NetrwBrowseXVis')

runtime/syntax/json.vim

@@ -2,7 +2,7 @@
 " Language:	JSON
 " Maintainer:	vacancy
 " Previous Maintainer:	Eli Parra <eli@elzr.com>
-" Last Change:	2019 Jul 08
+" Last Change:	2019 Sep 17
 " Version:      0.12
 
 if !exists("main_syntax")
@@ -20,7 +20,7 @@ syntax match   jsonNoise           /\%(:\|,\)/
 " Syntax: JSON Keywords
 " Separated into a match and region because a region by itself is always greedy
 syn match  jsonKeywordMatch /"\([^"]\|\\\"\)\+"[[:blank:]\r\n]*\:/ contains=jsonKeyword
-if has('conceal')
+if has('conceal') && (!exists("g:vim_json_conceal") || g:vim_json_conceal==1)
    syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ concealends contained
 else
    syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ contained
@@ -31,7 +31,7 @@ endif
 " Needs to come after keywords or else a json encoded string will break the
 " syntax
 syn match  jsonStringMatch /"\([^"]\|\\\"\)\+"\ze[[:blank:]\r\n]*[,}\]]/ contains=jsonString
-if has('conceal')
+if has('conceal') && (!exists("g:vim_json_conceal") || g:vim_json_conceal==1)
 	syn region  jsonString oneline matchgroup=jsonQuote start=/"/  skip=/\\\\\|\\"/  end=/"/ concealends contains=jsonEscape contained
 else
 	syn region  jsonString oneline matchgroup=jsonQuote start=/"/  skip=/\\\\\|\\"/  end=/"/ contains=jsonEscape contained