kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:e18dbe8

Browse Source 
Updated runtime files.

e18dbe865d
This commit is contained in:
James McCoy 2017-02-01 15:30:51 -05:00
parent 4e47568f89
commit a5b875fe86
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
11 changed files with 99 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/doc/eval.txt
View File

@ -784,8 +784,16 @@ equal" and "is" can be used. This compares the key/values of the |Dictionary|
recursively. Ignoring case means case is ignored when comparing item values.
*E694*
A |Funcref| can only be compared with a |Funcref| and only "equal" and "not
equal" can be used. Case is never ignored.
A |Funcref| can only be compared with a |Funcref| and only "equal", "not
equal", "is" and "isnot" can be used. Case is never ignored. Whether
arguments or a Dictionary are bound (with a partial) matters. The
Dictionaries must also be equal (or the same, in case of "is") and the
arguments must be equal (or the same).
To compare Funcrefs to see if they refer to the same function, ignoring bound
Dictionary and arguments, use |get()| to get the function name: >
if get(Part1, 'name') == get(Part2, 'name')
" Part1 and Part2 refer to the same function
When using "is" or "isnot" with a |List| or a |Dictionary| this checks if the
expressions are referring to the same |List| or |Dictionary| instance. A copy

2
runtime/doc/indent.txt
View File

@ -810,7 +810,7 @@ PHP indenting can be altered in several ways by modifying the values of some
global variables:
*php-comment* *PHP_autoformatcomment*
To not enable auto-formating of comments by default (if you want to use your
To not enable auto-formatting of comments by default (if you want to use your
own 'formatoptions'): >
:let g:PHP_autoformatcomment = 0

4
runtime/doc/options.txt
View File

@ -1238,8 +1238,8 @@ A jump table for the options with a short description can be found at |Q_op|.
Only non-printable keys are allowed.
The key can be specified as a single character, but it is difficult to
type. The preferred way is to use the <> notation. Examples: >
:set cedit=<C-Y>
:set cedit=<Esc>
:exe "set cedit=\<C-Y>"
:exe "set cedit=\<Esc>"
< |Nvi| also has this option, but it only uses the first character.
See |cmdwin|.

16
runtime/doc/quickfix.txt
View File

@ -30,10 +30,14 @@ positions in files. For example, |:vimgrep| finds pattern matches. You can
use the positions in a script with the |getqflist()| function. Thus you can
do a lot more than the edit/compile/fix cycle!
You should save your compiler's error messages to a file and start vim with
"vim -q filename". An easy way to do this is with the |:make| command (see
below). The 'errorformat' option should be set to match the error messages
from your compiler (see |errorformat| below).
If you have the error messages in a file you can start Vim with: >
vim -q filename
From inside Vim an easy way to run a command and handle the output is with the
|:make| command (see below).
The 'errorformat' option should be set to match the error messages from your
compiler (see |errorformat| below).
*location-list* *E776*
A location list is similar to a quickfix list and contains a list of positions
@ -42,8 +46,8 @@ have a separate location list. A location list can be associated with only
one window. The location list is independent of the quickfix list.
When a window with a location list is split, the new window gets a copy of the
location list. When there are no references to a location list, the location
list is destroyed.
location list. When there are no longer any references to a location list,
the location list is destroyed.
The following quickfix commands can be used. The location list commands are
similar to the quickfix commands, replacing the 'c' prefix in the quickfix

2
runtime/filetype.vim
View File

@ -1015,7 +1015,7 @@ au BufNewFile,BufRead *.jgr setf jgraph
au BufNewFile,BufRead *.jov,*.j73,*.jovial setf jovial
" JSON
au BufNewFile,BufRead *.json,*.jsonp setf json
au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest setf json
" Kixtart
au BufNewFile,BufRead *.kix setf kix

34
runtime/ftplugin/python.vim
View File

@ -2,7 +2,7 @@
" Language: python
" Maintainer: James Sully <sullyj3@gmail.com>
" Previous Maintainer: Johannes Zellner <johannes@zellner.org>
" Last Change: Fri, 10 June 2016
" Last Change: Wed, 29 June 2016
" https://github.com/sullyj3/vim-ftplugin-python
if exists("b:did_ftplugin") | finish | endif
@ -22,28 +22,38 @@ setlocal omnifunc=pythoncomplete#Complete
set wildignore+=*.pyc
nnoremap <silent> <buffer> ]] :call <SID>Python_jump('/^\(class\\|def\)\>')<cr>
nnoremap <silent> <buffer> [[ :call <SID>Python_jump('?^\(class\\|def\)\>')<cr>
nnoremap <silent> <buffer> ]m :call <SID>Python_jump('/^\s*\(class\\|def\)\>')<cr>
nnoremap <silent> <buffer> [m :call <SID>Python_jump('?^\s*\(class\\|def\)\>')<cr>
nnoremap <silent> <buffer> ]] :call <SID>Python_jump('n', '\v%$\|^(class\|def)>', 'W')<cr>
nnoremap <silent> <buffer> [[ :call <SID>Python_jump('n', '\v^(class\|def)>', 'Wb')<cr>
nnoremap <silent> <buffer> ]m :call <SID>Python_jump('n', '\v%$\|^\s*(class\|def)>', 'W')<cr>
nnoremap <silent> <buffer> [m :call <SID>Python_jump('n', '\v^\s*(class\|def)>', 'Wb')<cr>
xnoremap <silent> <buffer> ]] :call <SID>Python_jump('x', '\v%$\|^(class\|def)>', 'W')<cr>
xnoremap <silent> <buffer> [[ :call <SID>Python_jump('x', '\v^(class\|def)>', 'Wb')<cr>
xnoremap <silent> <buffer> ]m :call <SID>Python_jump('x', '\v%$\|^\s*(class\|def)>', 'W')<cr>
xnoremap <silent> <buffer> [m :call <SID>Python_jump('x', '\v^\s*(class\|def)>', 'Wb')<cr>
if !exists('*<SID>Python_jump')
fun! <SID>Python_jump(motion) range
fun! <SID>Python_jump(mode, motion, flags) range
if a:mode == 'x'
normal! gv
endif
normal! 0
let cnt = v:count1
let save = @/ " save last search pattern
mark '
while cnt > 0
silent! exe a:motion
let cnt = cnt - 1
call search(a:motion, a:flags)
let cnt = cnt - 1
endwhile
call histdel('/', -1)
let @/ = save " restore last search pattern
normal! ^
endfun
endif
if has("browsefilter") && !exists("b:browsefilter")
let b:browsefilter = "Python Files (*.py)\t*.py\n" .
\ "All Files (*.*)\t*.*\n"
\ "All Files (*.*)\t*.*\n"
endif
" As suggested by PEP8.

22
runtime/indent/sh.vim
View File

@ -3,9 +3,15 @@
" Maintainer: Christian Brabandt <cb@256bit.org>
" Previous Maintainer: Peter Aronoff <telemachus@arpinum.org>
" Original Author: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2016-02-15
" Latest Revision: 2016-06-27
" License: Vim (see :h license)
" Repository: https://github.com/chrisbra/vim-sh-indent
" Changelog:
" 20160627: - detect heredocs correctly
" 20160213: - detect function definition correctly
" 20160202: - use shiftwidth() function
" 20151215: - set b:undo_indent variable
" 20150728: - add foreach detection for zsh
if exists("b:did_indent")
finish
@ -102,6 +108,8 @@ function! GetShIndent()
endif
elseif s:is_case_break(line)
let ind -= s:indent_value('case-breaks')
elseif s:is_here_doc(line)
let ind = 0
endif
return ind
@ -160,6 +168,14 @@ function! s:is_case_break(line)
return a:line =~ '^\s*;[;&]'
endfunction
function! s:is_here_doc(line)
if a:line =~ '^\w\+$'
let here_pat = '<<-\?'. s:escape(a:line). '\$'
return search(here_pat, 'bnW') > 0
endif
return 0
endfunction
function! s:is_case_ended(line)
return s:is_case_break(a:line) || a:line =~ ';[;&]\s*\%(#.*\)\=$'
endfunction
@ -172,5 +188,9 @@ function! s:is_case_empty(line)
endif
endfunction
function! s:escape(pattern)
return '\V'. escape(a:pattern, '\\')
endfunction
let &cpo = s:cpo_save
unlet s:cpo_save

6
runtime/indent/vim.vim
View File

@ -1,7 +1,7 @@
" Vim indent file
" Language: Vim script
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2016 Apr 19
" Last Change: 2016 Jun 27
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
@ -60,7 +60,7 @@ function GetVimIndentIntern()
else
let ind = ind + shiftwidth() * 3
endif
elseif prev_text =~ '^\s*aug\%[roup]' && prev_text !~ '^\s*aug\%[roup]\s*!\=\s\+[eE][nN][dD]'
elseif prev_text =~ '^\s*aug\%[roup]\s\+' && prev_text !~ '^\s*aug\%[roup]\s\+[eE][nN][dD]\>'
let ind = ind + shiftwidth()
else
" A line starting with :au does not increment/decrement indent.
@ -89,7 +89,7 @@ function GetVimIndentIntern()
" Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
" :endfun, :else and :augroup END.
if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+[eE][nN][dD]\)'
if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s\+[eE][nN][dD]\)'
let ind = ind - shiftwidth()
endif

1
runtime/syntax/tex.vim
View File

@ -92,7 +92,6 @@ if !exists("g:tex_subscripts")
else
let s:tex_subscripts= g:tex_subscripts
endif
echomsg "s:tex_subscripts=".s:tex_subscripts
" Determine whether or not to use "*.sty" mode {{{1
" The user may override the normal determination by setting

16
src/nvim/po/eo.po
View File

@ -23,8 +23,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim(Esperanto)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-29 23:03+0200\n"
"PO-Revision-Date: 2016-03-29 23:05+0200\n"
"POT-Creation-Date: 2016-07-02 16:21+0200\n"
"PO-Revision-Date: 2016-07-02 17:05+0200\n"
"Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
"Language-Team: \n"
"Language: eo\n"
@ -512,6 +512,9 @@ msgstr "E714: Listo bezonata"
msgid "E715: Dictionary required"
msgstr "E715: Vortaro bezonata"
msgid "E928: String required"
msgstr "E928: Ĉeno bezonata"
#: ../eval.c:147
#, c-format
msgid "E118: Too many arguments for function: %s"
@ -831,6 +834,10 @@ msgstr "E655: Tro da simbolaj ligiloj (ĉu estas ciklo?)"
msgid "reverse() argument"
msgstr "argumento de reverse()"
#, c-format
msgid "E927: Invalid action: '%s'"
msgstr "E927: Nevalida ago: '%s'"
#: ../eval.c:13721
msgid "sort() argument"
msgstr "argumento de sort()"
@ -2013,6 +2020,9 @@ msgstr "Esprimo"
msgid "Input Line"
msgstr "Eniga linio"
msgid "Debug Line"
msgstr "Sencimiga linio"
#: ../ex_getln.c:5117
msgid "E198: cmd_pchar beyond the command length"
msgstr "E198: cmd_pchar preter la longo de komando"
@ -3255,6 +3265,7 @@ msgid ""
" i: Find files #including this file\n"
" s: Find this C symbol\n"
" t: Find this text string\n"
" a: Find assignments to this symbol\n"
msgstr ""
"\n"
" c: Trovi funkciojn, kiuj alvokas tiun funkcion\n"
@ -3265,6 +3276,7 @@ msgstr ""
" i: Trovi dosierojn, kiuj inkluzivas (#include) tiun dosieron\n"
" s: Trovi tiun C-simbolon\n"
" t: Trovi tiun ĉenon\n"
" a: Trovi valirizojn al tiu simbolo\n"
#: ../if_cscope.c:1226
msgid "E568: duplicate cscope database not added"

18
src/nvim/po/fr.po
View File

@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim(Français)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-07-30 17:54+0200\n"
"PO-Revision-Date: 2015-07-30 18:00+0200\n"
"POT-Creation-Date: 2016-07-02 16:21+0200\n"
"PO-Revision-Date: 2016-07-02 17:06+0200\n"
"Last-Translator: Dominique Pellé <dominique.pelle@gmail.com>\n"
"Language-Team: \n"
"Language: fr\n"
@ -569,6 +569,9 @@ msgstr "E714: Liste requise"
msgid "E715: Dictionary required"
msgstr "E715: Dictionnaire requis"
msgid "E928: String required"
msgstr "E928: Chaine requis"
# DB : Suggestion
#: ../eval.c:147
#, c-format
@ -900,6 +903,10 @@ msgstr "E655: Trop de liens symboliques (cycle ?)"
msgid "reverse() argument"
msgstr "argument de reverse()"
#, c-format
msgid "E927: Invalid action: '%s'"
msgstr "E927: Action invalide : « %s »"
#: ../eval.c:13721
msgid "sort() argument"
msgstr "argument de sort()"
@ -1608,7 +1615,7 @@ msgstr "E162: Le tampon %s n'a pas
#: ../ex_cmds2.c:1480
msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
msgstr "Alerte : Entrée inattendue dans un autre tampon (vérifier autocmdes)"
msgstr "Alerte : Entrée inattendue dans un autre tampon (vérifier autocommandes)"
#: ../ex_cmds2.c:1826
msgid "E163: There is only one file to edit"
@ -2177,6 +2184,9 @@ msgstr "expression"
msgid "Input Line"
msgstr "ligne de saisie"
msgid "Debug Line"
msgstr "Ligne de débogage"
#: ../ex_getln.c:5117
msgid "E198: cmd_pchar beyond the command length"
msgstr "E198: cmd_pchar au-delà de la longueur de la commande"
@ -3442,6 +3452,7 @@ msgid ""
" i: Find files #including this file\n"
" s: Find this C symbol\n"
" t: Find this text string\n"
" a: Find assignments to this symbol\n"
msgstr ""
"\n"
" c: Trouver les fonctions appelant cette fonction\n"
@ -3452,6 +3463,7 @@ msgstr ""
" i: Trouver les fichiers qui #incluent ce fichier\n"
" s: Trouver ce symbole C\n"
" t: Trouver cette chaîne\n"
" a: Trouver les assignements à ce symbole\n"
#: ../if_cscope.c:1226
msgid "E568: duplicate cscope database not added"