Permalink
Browse files

Merge #7503 from justinmk/vim-patches

  • Loading branch information...
justinmk committed Nov 7, 2017
2 parents ae569ea + 2ca5963 commit bbf730aa3180c4522c34f4529130827874be25d1
Showing with 9,399 additions and 7,328 deletions.
  1. +0 −1 .gitignore
  2. +1 −1 runtime/autoload/ada.vim
  3. +828 −544 runtime/autoload/netrw.vim
  4. +7 −3 runtime/autoload/netrwSettings.vim
  5. +2 −2 runtime/autoload/paste.vim
  6. +1 −1 runtime/autoload/sqlcomplete.vim
  7. +7 −0 runtime/doc/autocmd.txt
  8. +3 −1 runtime/doc/cmdline.txt
  9. +4 −4 runtime/doc/diff.txt
  10. +83 −69 runtime/doc/eval.txt
  11. +1 −1 runtime/doc/filetype.txt
  12. +1 −1 runtime/doc/ft_rust.txt
  13. +8 −1 runtime/doc/gui.txt
  14. +2 −0 runtime/doc/help.txt
  15. +4 −0 runtime/doc/index.txt
  16. +4 −0 runtime/doc/intro.txt
  17. +6 −6 runtime/doc/map.txt
  18. +3 −0 runtime/doc/message.txt
  19. +16 −5 runtime/doc/options.txt
  20. +260 −95 runtime/doc/pi_netrw.txt
  21. +7 −0 runtime/doc/quickfix.txt
  22. +1 −1 runtime/doc/spell.txt
  23. +6 −7 runtime/doc/syntax.txt
  24. +1 −0 runtime/doc/tagsrch.txt
  25. +3 −3 runtime/doc/usr_07.txt
  26. +5 −5 runtime/doc/usr_09.txt
  27. +1 −1 runtime/doc/usr_41.txt
  28. +4 −4 runtime/doc/various.txt
  29. +3 −1 runtime/doc/windows.txt
  30. +19 −6 runtime/filetype.vim
  31. +3 −3 runtime/ftplugin/c.vim
  32. +12 −0 runtime/ftplugin/gdb.vim
  33. +23 −0 runtime/ftplugin/neomuttrc.vim
  34. +7 −6 runtime/ftplugin/perl.vim
  35. +29 −6 runtime/ftplugin/python.vim
  36. +4 −6 runtime/indent/cmake.vim
  37. +7 −3 runtime/indent/gitolite.vim
  38. +288 −217 runtime/indent/javascript.vim
  39. +3 −6 runtime/indent/perl.vim
  40. +9 −8 runtime/indent/vhdl.vim
  41. +7 −1 runtime/optwin.vim
  42. +5 −0 runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
  43. +1 −1 runtime/plugin/matchit.vim
  44. +18 −4 runtime/plugin/matchparen.vim
  45. +5 −9 runtime/plugin/netrwPlugin.vim
  46. +1 −1 runtime/scripts.vim
  47. +8 −7 runtime/synmenu.vim
  48. +6 −3 runtime/syntax/bib.vim
  49. +1 −1 runtime/syntax/clojure.vim
  50. +447 −44 runtime/syntax/cmake.vim
  51. +5 −4 runtime/syntax/doxygen.vim
  52. +5 −5 runtime/syntax/form.vim
  53. +79 −71 runtime/syntax/gitolite.vim
  54. +5 −1 runtime/syntax/help.vim
  55. +13 −4 runtime/syntax/html.vim
  56. +32 −24 runtime/syntax/mason.vim
  57. +1,032 −0 runtime/syntax/neomuttrc.vim
  58. +52 −28 runtime/syntax/netrw.vim
  59. +97 −102 runtime/syntax/perl.vim
  60. +2 −3 runtime/syntax/pod.vim
  61. +4 −1 runtime/syntax/readline.vim
  62. +23 −16 runtime/syntax/sh.vim
  63. +2 −3 runtime/syntax/sshdconfig.vim
  64. +97 −0 runtime/syntax/tap.vim
  65. +23 −9 runtime/syntax/tex.vim
  66. +3 −3 runtime/syntax/tt2.vim
  67. +3 −4 runtime/syntax/vim.vim
  68. +2,179 −1,763 runtime/syntax/xs.vim
  69. +0 −56 runtime/vimrc_example.vim
  70. +5 −1 scripts/vim-patch.sh
  71. +3,391 −3,859 src/nvim/po/af.po
  72. +69 −119 src/nvim/po/eo.po
  73. +18 −39 src/nvim/po/fi.po
  74. +72 −120 src/nvim/po/fr.po
  75. +9 −0 src/nvim/po/it.po
  76. +4 −4 src/nvim/po/pt_BR.po
@@ -5,7 +5,6 @@
/.deps/
/tmp/
*.orig
*.mo
.*.sw?
*~
@@ -591,7 +591,7 @@ function ada#Map_Menu (Text, Keys, Command)
\" :" . a:Command
execute
\ "inoremap <buffer>" .
\ " <Learder>a" . a:Keys .
\ " <Leader>a" . a:Keys .
\" <C-O>:" . a:Command
endif
return

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,7 +1,7 @@
" netrwSettings.vim: makes netrw settings simpler
" Date: Dec 30, 2014
" Date: Nov 09, 2016
" Maintainer: Charles E Campbell <drchipNOSPAM at campbellfamily dot biz>
" Version: 15
" Version: 16
" Copyright: Copyright (C) 1999-2007 Charles E. Campbell {{{1
" Permission is hereby granted to use and distribute this code,
" with or without modifications, provided that this copyright
@@ -19,7 +19,7 @@
if exists("g:loaded_netrwSettings") || &cp
finish
endif
let g:loaded_netrwSettings = "v15"
let g:loaded_netrwSettings = "v16"
if v:version < 700
echohl WarningMsg
echo "***warning*** this version of netrwSettings needs vim 7.0"
@@ -154,9 +154,13 @@ fun! netrwSettings#NetrwSettings()
put = 'let g:netrw_list_hide = '.g:netrw_list_hide
put = 'let g:netrw_liststyle = '.g:netrw_liststyle
put = 'let g:netrw_localcopycmd = '.g:netrw_localcopycmd
put = 'let g:netrw_localcopycmdopt = '.g:netrw_localcopycmdopt
put = 'let g:netrw_localmkdir = '.g:netrw_localmkdir
put = 'let g:netrw_localmkdiropt = '.g:netrw_localmkdiropt
put = 'let g:netrw_localmovecmd = '.g:netrw_localmovecmd
put = 'let g:netrw_localmovecmdopt = '.g:netrw_localmovecmdopt
put = 'let g:netrw_localrmdir = '.g:netrw_localrmdir
put = 'let g:netrw_localrmdiropt = '.g:netrw_localrmdiropt
put = 'let g:netrw_maxfilenamelen = '.g:netrw_maxfilenamelen
put = 'let g:netrw_menu = '.g:netrw_menu
put = 'let g:netrw_mousemaps = '.g:netrw_mousemaps
@@ -1,6 +1,6 @@
" Vim support file to help with paste mappings and menus
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2006 Jun 23
" Last Change: 2017 Aug 30
" Define the string to use for items that are present both in Edit, Popup and
" Toolbar menu. Also used in mswin.vim and macmap.vim.
@@ -12,7 +12,7 @@
if has("virtualedit")
let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
let paste#paste_cmd['i'] = 'x<BS><Esc>' . paste#paste_cmd['n'] . 'gi'
let paste#paste_cmd['i'] = "\<c-\>\<c-o>\"+gP"
func! paste#Paste()
let ove = &ve
@@ -2,7 +2,7 @@
" Language: SQL
" Maintainer: David Fishburn <dfishburn dot vim at gmail dot com>
" Version: 16.0
" Last Change: 2015 Dec 29
" Last Change: 2017 Oct 15
" Homepage: http://www.vim.org/scripts/script.php?script_id=1572
" Usage: For detailed help
" ":help sql.txt"
@@ -55,7 +55,14 @@ Note: The ":autocmd" command can only be followed by another command when the
'|' appears before {cmd}. This works: >
:augroup mine | au! BufRead | augroup END
But this sees "augroup" as part of the defined command: >
:augroup mine | au! BufRead * | augroup END
:augroup mine | au BufRead * set tw=70 | augroup END
Instead you can put the group name into the command: >
:au! mine BufRead *
:au mine BufRead * set tw=70
Or use `:execute`: >
:augroup mine | exe "au! BufRead *" | augroup END
:augroup mine | exe "au BufRead * set tw=70" | augroup END
Note that special characters (e.g., "%", "<cword>") in the ":autocmd"
arguments are not expanded when the autocommand is defined. These will be
@@ -781,14 +781,16 @@ Also see |`=|.
*:<cword>* *:<cWORD>* *:<cfile>* *<cfile>*
*:<sfile>* *<sfile>* *:<afile>* *<afile>*
*:<abuf>* *<abuf>* *:<amatch>* *<amatch>*
*:<cexpr>* *<cexpr>*
*<slnum>* *E495* *E496* *E497* *E499* *E500*
Note: these are typed literally, they are not special keys!
<cword> is replaced with the word under the cursor (like |star|)
<cWORD> is replaced with the WORD under the cursor (see |WORD|)
<cfile> is replaced with the path name under the cursor (like what
|gf| uses)
<afile> When executing autocommands, is replaced with the file name
for a file read or write.
of the buffer being manipulated, or the file for a read or
write.
<abuf> When executing autocommands, is replaced with the currently
effective buffer number (for ":r file" and ":so file" it is
the current buffer, the file being read/sourced is not in a
@@ -13,7 +13,7 @@ The basics are explained in section |08.7| of the user manual.
Type |gO| to see the table of contents.
==============================================================================
1. Starting diff mode
1. Starting diff mode *start-vimdiff*
To start editing in diff mode, run "nvim -d". This starts Nvim as usual, and
additionally sets up for viewing the differences between the arguments. >
@@ -214,8 +214,8 @@ The diffs are highlighted with these groups:
(searching from the end of the line). The
text in between is highlighted. This means
that parts in the middle that are still the
same are highlighted anyway. Only "iwhite" of
'diffopt' is used here.
same are highlighted anyway. The 'diffopt'
flags "iwhite" and "icase" are used here.
|hl-DiffDelete| DiffDelete Deleted lines. Also called filler lines,
because they don't really exist in this
buffer.
@@ -314,7 +314,7 @@ g:diff_translations to zero: >
let g:diff_translations = 0
<
After setting this variable, Reload the syntax script: >
After setting this variable, reload the syntax script: >
set syntax=diff
<
Oops, something went wrong.

0 comments on commit bbf730a

Please sign in to comment.