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

vim-patch:9faec4e3d439

Browse Source 
Update runtime files.
9faec4e3d4

Omit vim9.
This commit is contained in:
Jan Edmund Lazo 2021-05-02 10:19:25 -04:00
parent 2081504a33
commit 6a8436065c
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
12 changed files with 150 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/autoload/syntaxcomplete.vim
View File

@ -1,12 +1,16 @@
" Vim completion script " Vim completion script
" Language: All languages, uses existing syntax highlighting rules " Language: All languages, uses existing syntax highlighting rules
" Maintainer: David Fishburn <dfishburn dot vim at gmail dot com> " Maintainer: David Fishburn <dfishburn dot vim at gmail dot com>
" Version: 13.0 " Version: 14.0
" Last Change: 2019 Aug 08 " Last Change: 2020 Dec 30
" Usage: For detailed help, ":help ft-syntax-omni" " Usage: For detailed help, ":help ft-syntax-omni"
" History " History
" "
" Version 14.0
" - Fixed issue with single quotes and is_keyword
" https://github.com/vim/vim/issues/7463
"
" Version 13.0 " Version 13.0
" - Extended the option omni_syntax_group_include_{filetype} " - Extended the option omni_syntax_group_include_{filetype}
" to accept a comma separated list of regex's rather than " to accept a comma separated list of regex's rather than
@ -179,7 +183,8 @@ function! syntaxcomplete#Complete(findstart, base)
endif endif
" let base = s:prepended . a:base " let base = s:prepended . a:base
let base = s:prepended " let base = s:prepended
let base = substitute(s:prepended, "'", "''", 'g')
let filetype = substitute(&filetype, '\.', '_', 'g') let filetype = substitute(&filetype, '\.', '_', 'g')
let list_idx = index(s:cache_name, filetype, 0, &ignorecase) let list_idx = index(s:cache_name, filetype, 0, &ignorecase)

28
runtime/compiler/sml.vim Normal file
View File

@ -0,0 +1,28 @@
" Vim compiler file
" Compiler: SML/NJ Compiler
" Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2020 Feb 10
if exists("current_compiler")
finish
endif
let current_compiler = "sml"
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
command -nargs=* CompilerSet setlocal <args>
endif
let s:cpo_save = &cpo
set cpo&vim
CompilerSet makeprg=sml
CompilerSet errorformat=%f:%l.%c-%\\d%\\+.%\\d%\\+\ %trror:\ %m,
\%f:%l.%c\ %trror:\ %m,
\%trror:\ %m
\%f:%l.%c-%\\d%\\+.%\\d%\\+\ %tarning:\ %m,
\%f:%l.%c\ %tarning:\ %m,
\%tarning:\ %m,
\%-G%.%#
let &cpo = s:cpo_save
unlet s:cpo_save

2
runtime/doc/pattern.txt
View File

@ -219,7 +219,7 @@ This is like executing two search commands after each other, except that:
*last-pattern* *last-pattern*
The last used pattern and offset are remembered. They can be used to repeat The last used pattern and offset are remembered. They can be used to repeat
the search, possibly in another direction or with another count. Note that the search, possibly in another direction or with another count. Note that
two patterns are remembered: One for 'normal' search commands and one for the two patterns are remembered: One for "normal" search commands and one for the
substitute command ":s". Each time an empty pattern is given, the previously substitute command ":s". Each time an empty pattern is given, the previously
used pattern is used. However, if there is no previous search command, a used pattern is used. However, if there is no previous search command, a
previous substitute pattern is used, if possible. previous substitute pattern is used, if possible.

2
runtime/doc/repeat.txt
View File

@ -823,7 +823,7 @@ DEFINING BREAKPOINTS
valid in the script where it has been defined and if that valid in the script where it has been defined and if that
script is called from several other scripts, this will stop script is called from several other scripts, this will stop
whenever that particular variable will become visible or whenever that particular variable will become visible or
unaccessible again. inaccessible again.
The [lnum] is the line number of the breakpoint. Vim will stop at or after The [lnum] is the line number of the breakpoint. Vim will stop at or after
this line. When omitted line 1 is used. this line. When omitted line 1 is used.

6
runtime/doc/usr_04.txt
View File

@ -463,9 +463,9 @@ of characters to replace. It will not continue on the next line.
You can switch between Insert mode and Replace mode with the <Insert> key. You can switch between Insert mode and Replace mode with the <Insert> key.
When you use <BS> (backspace) to make correction, you will notice that the When you use <BS> (backspace) to make a correction, you will notice that the
old text is put back. Thus it works like an undo command for the last typed old text is put back. Thus it works like an undo command for the previously
character. typed character.
============================================================================== ==============================================================================
*04.10* Conclusion *04.10* Conclusion

4
runtime/ftplugin/lisp.vim
View File

@ -14,13 +14,11 @@ endif
" Don't load another plugin for this buffer " Don't load another plugin for this buffer
let b:did_ftplugin = 1 let b:did_ftplugin = 1
setl comments=:; setl comments=:;;;;,:;;;,:;;,:;,sr:#\|,mb:\|,ex:\|#
setl define=^\\s*(def\\k* setl define=^\\s*(def\\k*
setl formatoptions-=t setl formatoptions-=t
setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94 setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94
setl lisp setl lisp
setl commentstring=;%s setl commentstring=;%s
setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|#
let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp< commentstring<" let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp< commentstring<"

4
runtime/ftplugin/vim.vim
View File

@ -1,7 +1,7 @@
" Vim filetype plugin " Vim filetype plugin
" Language: Vim " Language: Vim
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2021 Feb 07 " Last Change: 2021 Feb 20
" Only do this when not done yet for this buffer " Only do this when not done yet for this buffer
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
@ -55,7 +55,7 @@ if "\n" .. join(getline(1, 10), "\n") =~# '\n\s*vim9\%[script]\>'
" Comments starts with # in Vim9 script " Comments starts with # in Vim9 script
setlocal commentstring=#%s setlocal commentstring=#%s
else else
setlocal com=sO:\"\ -,mO:\"\ \ ,:\" setlocal com=sO:\"\ -,mO:\"\ \ ,eO:\"\",:\"
" Comments starts with a double quote in legacy script " Comments starts with a double quote in legacy script
setlocal commentstring=\"%s setlocal commentstring=\"%s
endif endif

6
runtime/indent/vim.vim
View File

@ -1,7 +1,7 @@
" Vim indent file " Vim indent file
" Language: Vim script " Language: Vim script
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2021 Feb 13 " Last Change: 2021 Feb 18
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
if exists("b:did_indent") if exists("b:did_indent")
@ -160,9 +160,9 @@ function GetVimIndentIntern()
endif endif
let ends_in_comment = has('syntax_items') let ends_in_comment = has('syntax_items')
\ && synIDattr(synID(lnum, col('$'), 1), "name") =~ '\(Comment\|String\)$' \ && synIDattr(synID(lnum, len(getline(lnum)), 1), "name") =~ '\(Comment\|String\)$'
" A line ending in "{"/"[} is most likely the start of a dict/list literal, " A line ending in "{" or "[" is most likely the start of a dict/list literal,
" indent the next line more. Not for a continuation line or {{{. " indent the next line more. Not for a continuation line or {{{.
if !ends_in_comment && prev_text_end =~ '\s[{[]\s*$' && !found_cont if !ends_in_comment && prev_text_end =~ '\s[{[]\s*$' && !found_cont
let ind = ind + shiftwidth() let ind = ind + shiftwidth()

25
runtime/syntax/html.vim
View File

@ -1,10 +1,10 @@
" Vim syntax file " Vim syntax file
" Language: HTML " Language: HTML
" Maintainer: Jorge Maldonado Ventura <jorgesumle@freakspot.net> " Previous Maintainer: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
" Previous Maintainer: Claudio Fleiner <claudio@fleiner.com> " Previous Maintainer: Claudio Fleiner <claudio@fleiner.com>
" Repository: https://notabug.org/jorgesumle/vim-html-syntax " Repository: https://notabug.org/jorgesumle/vim-html-syntax
" Last Change: 2020 Mar 17 " Last Change: 2021 Feb 25
" Included patch from Florian Breisch to add the summary element " Included patch #7900 to fix comments
" "
" Please check :help html.vim for some comments and a description of the options " Please check :help html.vim for some comments and a description of the options
@ -141,9 +141,21 @@ syn match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};"
if exists("html_wrong_comments") if exists("html_wrong_comments")
syn region htmlComment start=+<!--+ end=+--\s*>+ contains=@Spell syn region htmlComment start=+<!--+ end=+--\s*>+ contains=@Spell
else else
syn region htmlComment start=+<!+ end=+>+ contains=htmlCommentPart,htmlCommentError,@Spell " The HTML 5.2 syntax 8.2.4.41-42: bogus comment is parser error; browser skips until next &gt;
syn match htmlCommentError contained "[^><!]" " Note: must stand first to get lesser :syn-priority
syn region htmlCommentPart contained start=+--+ end=+--\s*+ contains=@htmlPreProc,@Spell syn region htmlComment start=+<!+ end=+>+ contains=htmlCommentError
" Normal comment opening <!-- ...>
syn region htmlComment start=+<!--+ end=+>+ contains=htmlCommentPart,@Spell
" Idem 8.2.4.43-44: <!--> and <!---> are parser errors; browser treats as comments
syn match htmlComment "<!---\?>" contains=htmlCommentError
" Idem 8.2.4.51: any number of consecutive dashes within comment is okay; --> closes comment
" Idem 8.2.4.52: closing comment by dash-dash-bang (--!>) is error ignored by parser(!); closes comment
syn region htmlCommentPart contained start=+--+ end=+--!\?>+me=e-1 contains=htmlCommentNested,@htmlPreProc,@Spell
" Idem 8.2.4.49: opening nested comment <!-- is parser error, ignored by browser, except <!--> is all right
syn match htmlCommentNested contained "<!--[^>]"me=e-1
syn match htmlCommentNested contained "<!--->"me=e-3
syn match htmlCommentNested contained "<!---\?!>"me=e-4
syn match htmlCommentError contained "[^><!]"
endif endif
syn region htmlComment start=+<!DOCTYPE+ keepend end=+>+ syn region htmlComment start=+<!DOCTYPE+ keepend end=+>+
@ -317,6 +329,7 @@ hi def link htmlStatement Statement
hi def link htmlComment Comment hi def link htmlComment Comment
hi def link htmlCommentPart Comment hi def link htmlCommentPart Comment
hi def link htmlValue String hi def link htmlValue String
hi def link htmlCommentNested htmlCommentError
hi def link htmlCommentError htmlError hi def link htmlCommentError htmlError
hi def link htmlTagError htmlError hi def link htmlTagError htmlError
hi def link htmlEvent javaScript hi def link htmlEvent javaScript

23
runtime/syntax/lhaskell.vim
View File

@ -1,11 +1,11 @@
" Vim syntax file " Vim syntax file
" Language: Haskell with literate comments, Bird style, " Language: Haskell with literate comments, Bird style,
" TeX style and plain text surrounding " Markdown style, TeX style and plain text surrounding
" \begin{code} \end{code} blocks " \begin{code} \end{code} blocks
" Maintainer: Haskell Cafe mailinglist <haskell-cafe@haskell.org> " Maintainer: Haskell Cafe mailinglist <haskell-cafe@haskell.org>
" Original Author: Arthur van Leeuwen <arthurvl@cs.uu.nl> " Original Author: Arthur van Leeuwen <arthurvl@cs.uu.nl>
" Last Change: 2010 Apr 11 " Last Change: 2020 Feb 25
" Version: 1.04 " Version: 1.05
" "
" Thanks to Ian Lynagh for thoughtful comments on initial versions and " Thanks to Ian Lynagh for thoughtful comments on initial versions and
" for the inspiration for writing this in the first place. " for the inspiration for writing this in the first place.
@ -44,8 +44,8 @@ endif
" First off, see if we can inherit a user preference for lhs_markup " First off, see if we can inherit a user preference for lhs_markup
if !exists("b:lhs_markup") if !exists("b:lhs_markup")
if exists("lhs_markup") if exists("lhs_markup")
if lhs_markup =~ '\<\%(tex\|none\)\>' if lhs_markup =~ '\<\%(tex\|md\|none\)\>'
let b:lhs_markup = matchstr(lhs_markup,'\<\%(tex\|none\)\>') let b:lhs_markup = matchstr(lhs_markup,'\<\%(tex\|md\|none\)\>')
else else
echohl WarningMsg | echo "Unknown value of lhs_markup" | echohl None echohl WarningMsg | echo "Unknown value of lhs_markup" | echohl None
let b:lhs_markup = "unknown" let b:lhs_markup = "unknown"
@ -54,7 +54,7 @@ if !exists("b:lhs_markup")
let b:lhs_markup = "unknown" let b:lhs_markup = "unknown"
endif endif
else else
if b:lhs_markup !~ '\<\%(tex\|none\)\>' if b:lhs_markup !~ '\<\%(tex\|md\|none\)\>'
let b:lhs_markup = "unknown" let b:lhs_markup = "unknown"
endif endif
endif endif
@ -74,6 +74,8 @@ call cursor(1,1)
if b:lhs_markup == "unknown" if b:lhs_markup == "unknown"
if search('\\documentclass\|\\begin{\(code}\)\@!\|\\\(sub\)*section\|\\chapter|\\part','W') != 0 if search('\\documentclass\|\\begin{\(code}\)\@!\|\\\(sub\)*section\|\\chapter|\\part','W') != 0
let b:lhs_markup = "tex" let b:lhs_markup = "tex"
elseif search('```haskell','W') != 0
let b:lhs_markup = "md"
else else
let b:lhs_markup = "plain" let b:lhs_markup = "plain"
endif endif
@ -86,6 +88,10 @@ if b:lhs_markup == "tex"
" Tex.vim removes "_" from 'iskeyword', but we need it for Haskell. " Tex.vim removes "_" from 'iskeyword', but we need it for Haskell.
setlocal isk+=_ setlocal isk+=_
syntax cluster lhsTeXContainer contains=tex.*Zone,texAbstract syntax cluster lhsTeXContainer contains=tex.*Zone,texAbstract
elseif b:lhs_markup == "md"
runtime! syntax/markdown.vim
unlet b:current_syntax
syntax cluster lhsTeXContainer contains=markdown.*
else else
syntax cluster lhsTeXContainer contains=.* syntax cluster lhsTeXContainer contains=.*
endif endif
@ -96,9 +102,12 @@ syntax include @haskellTop syntax/haskell.vim
syntax region lhsHaskellBirdTrack start="^>" end="\%(^[^>]\)\@=" contains=@haskellTop,lhsBirdTrack containedin=@lhsTeXContainer syntax region lhsHaskellBirdTrack start="^>" end="\%(^[^>]\)\@=" contains=@haskellTop,lhsBirdTrack containedin=@lhsTeXContainer
syntax region lhsHaskellBeginEndBlock start="^\\begin{code}\s*$" matchgroup=NONE end="\%(^\\end{code}.*$\)\@=" contains=@haskellTop,beginCodeBegin containedin=@lhsTeXContainer syntax region lhsHaskellBeginEndBlock start="^\\begin{code}\s*$" matchgroup=NONE end="\%(^\\end{code}.*$\)\@=" contains=@haskellTop,beginCodeBegin containedin=@lhsTeXContainer
syntax region lhsHaskellMDBlock start="^```haskell$" matchgroup=NONE end="^```$" keepend contains=@haskellTop,lhsMarkdownCode containedin=@lhsTeXContainer
syntax match lhsBirdTrack "^>" contained syntax match lhsBirdTrack "^>" contained
syntax match lhsMarkdownCode "^\(```haskell\|^```\)$" contained
syntax match beginCodeBegin "^\\begin" nextgroup=beginCodeCode contained syntax match beginCodeBegin "^\\begin" nextgroup=beginCodeCode contained
syntax region beginCodeCode matchgroup=texDelimiter start="{" end="}" syntax region beginCodeCode matchgroup=texDelimiter start="{" end="}"
@ -107,6 +116,8 @@ syntax region beginCodeCode matchgroup=texDelimiter start="{" end="}"
hi def link lhsBirdTrack Comment hi def link lhsBirdTrack Comment
hi def link lhsMarkdownCode Comment
hi def link beginCodeBegin texCmdName hi def link beginCodeBegin texCmdName
hi def link beginCodeCode texSection hi def link beginCodeCode texSection

112
runtime/syntax/python.vim
View File

@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: Python " Language: Python
" Maintainer: Zvezdan Petkovic <zpetkovic@acm.org> " Maintainer: Zvezdan Petkovic <zpetkovic@acm.org>
" Last Change: 2016 Oct 29 " Last Change: 2021 Feb 15
" Credits: Neil Schemenauer <nas@python.ca> " Credits: Neil Schemenauer <nas@python.ca>
" Dmitry Vasiliev " Dmitry Vasiliev
" "
@ -71,30 +71,17 @@ endif
" Keep Python keywords in alphabetical order inside groups for easy " Keep Python keywords in alphabetical order inside groups for easy
" comparison with the table in the 'Python Language Reference' " comparison with the table in the 'Python Language Reference'
" https://docs.python.org/2/reference/lexical_analysis.html#keywords, " https://docs.python.org/reference/lexical_analysis.html#keywords.
" https://docs.python.org/3/reference/lexical_analysis.html#keywords.
" Groups are in the order presented in NAMING CONVENTIONS in syntax.txt. " Groups are in the order presented in NAMING CONVENTIONS in syntax.txt.
" Exceptions come last at the end of each group (class and def below). " Exceptions come last at the end of each group (class and def below).
" "
" Keywords 'with' and 'as' are new in Python 2.6 " The list can be checked using:
" (use 'from __future__ import with_statement' in Python 2.5).
" "
" Some compromises had to be made to support both Python 3 and 2. " python3 -c 'import keyword, pprint; pprint.pprint(keyword.kwlist, compact=True)'
" We include Python 3 features, but when a definition is duplicated,
" the last definition takes precedence.
"
" - 'False', 'None', and 'True' are keywords in Python 3 but they are
" built-ins in 2 and will be highlighted as built-ins below.
" - 'exec' is a built-in in Python 3 and will be highlighted as
" built-in below.
" - 'nonlocal' is a keyword in Python 3 and will be highlighted.
" - 'print' is a built-in in Python 3 and will be highlighted as
" built-in below (use 'from __future__ import print_function' in 2)
" - async and await were added in Python 3.5 and are soft keywords.
" "
syn keyword pythonStatement False None True syn keyword pythonStatement False None True
syn keyword pythonStatement as assert break continue del exec global syn keyword pythonStatement as assert break continue del global
syn keyword pythonStatement lambda nonlocal pass print return with yield syn keyword pythonStatement lambda nonlocal pass return with yield
syn keyword pythonStatement class def nextgroup=pythonFunction skipwhite syn keyword pythonStatement class def nextgroup=pythonFunction skipwhite
syn keyword pythonConditional elif else if syn keyword pythonConditional elif else if
syn keyword pythonRepeat for while syn keyword pythonRepeat for while
@ -103,7 +90,7 @@ syn keyword pythonException except finally raise try
syn keyword pythonInclude from import syn keyword pythonInclude from import
syn keyword pythonAsync async await syn keyword pythonAsync async await
" Decorators (new in Python 2.4) " Decorators
" A dot must be allowed because of @MyClass.myfunc decorators. " A dot must be allowed because of @MyClass.myfunc decorators.
syn match pythonDecorator "@" display contained syn match pythonDecorator "@" display contained
syn match pythonDecoratorName "@\s*\h\%(\w\|\.\)*" display contains=pythonDecorator syn match pythonDecoratorName "@\s*\h\%(\w\|\.\)*" display contains=pythonDecorator
@ -168,8 +155,7 @@ syn match pythonEscape "\\$"
" - 08e0 or 08j are highlighted, " - 08e0 or 08j are highlighted,
" "
" and so on, as specified in the 'Python Language Reference'. " and so on, as specified in the 'Python Language Reference'.
" https://docs.python.org/2/reference/lexical_analysis.html#numeric-literals " https://docs.python.org/reference/lexical_analysis.html#numeric-literals
" https://docs.python.org/3/reference/lexical_analysis.html#numeric-literals
if !exists("python_no_number_highlight") if !exists("python_no_number_highlight")
" numbers (including longs and complex) " numbers (including longs and complex)
syn match pythonNumber "\<0[oO]\=\o\+[Ll]\=\>" syn match pythonNumber "\<0[oO]\=\o\+[Ll]\=\>"
@ -186,37 +172,37 @@ endif
" Group the built-ins in the order in the 'Python Library Reference' for " Group the built-ins in the order in the 'Python Library Reference' for
" easier comparison. " easier comparison.
" https://docs.python.org/2/library/constants.html " https://docs.python.org/library/constants.html
" https://docs.python.org/3/library/constants.html " http://docs.python.org/library/functions.html
" http://docs.python.org/2/library/functions.html
" http://docs.python.org/3/library/functions.html
" http://docs.python.org/2/library/functions.html#non-essential-built-in-functions
" http://docs.python.org/3/library/functions.html#non-essential-built-in-functions
" Python built-in functions are in alphabetical order. " Python built-in functions are in alphabetical order.
"
" The list can be checked using:
"
" python3 -c 'import builtins, pprint; pprint.pprint(dir(builtins), compact=True)'
"
" The constants added by the `site` module are not listed below because they
" should not be used in programs, only in interactive interpreter.
" Similarly for some other attributes and functions `__`-enclosed from the
" output of the above command.
"
if !exists("python_no_builtin_highlight") if !exists("python_no_builtin_highlight")
" built-in constants " built-in constants
" 'False', 'True', and 'None' are also reserved words in Python 3 " 'False', 'True', and 'None' are also reserved words in Python 3
syn keyword pythonBuiltin False True None syn keyword pythonBuiltin False True None
syn keyword pythonBuiltin NotImplemented Ellipsis __debug__ syn keyword pythonBuiltin NotImplemented Ellipsis __debug__
" constants added by the `site` module
syn keyword pythonBuiltin quit exit copyright credits license
" built-in functions " built-in functions
syn keyword pythonBuiltin abs all any bin bool bytearray callable chr syn keyword pythonBuiltin abs all any ascii bin bool breakpoint bytearray
syn keyword pythonBuiltin classmethod compile complex delattr dict dir syn keyword pythonBuiltin bytes callable chr classmethod compile complex
syn keyword pythonBuiltin divmod enumerate eval filter float format syn keyword pythonBuiltin delattr dict dir divmod enumerate eval exec
syn keyword pythonBuiltin frozenset getattr globals hasattr hash syn keyword pythonBuiltin filter float format frozenset getattr globals
syn keyword pythonBuiltin help hex id input int isinstance syn keyword pythonBuiltin hasattr hash help hex id input int isinstance
syn keyword pythonBuiltin issubclass iter len list locals map max syn keyword pythonBuiltin issubclass iter len list locals map max
syn keyword pythonBuiltin memoryview min next object oct open ord pow syn keyword pythonBuiltin memoryview min next object oct open ord pow
syn keyword pythonBuiltin print property range repr reversed round set syn keyword pythonBuiltin print property range repr reversed round set
syn keyword pythonBuiltin setattr slice sorted staticmethod str syn keyword pythonBuiltin setattr slice sorted staticmethod str sum super
syn keyword pythonBuiltin sum super tuple type vars zip __import__ syn keyword pythonBuiltin tuple type vars zip __import__
" Python 2 only
syn keyword pythonBuiltin basestring cmp execfile file
syn keyword pythonBuiltin long raw_input reduce reload unichr
syn keyword pythonBuiltin unicode xrange
" Python 3 only
syn keyword pythonBuiltin ascii bytes exec
" non-essential built-in functions; Python 2 only
syn keyword pythonBuiltin apply buffer coerce intern
" avoid highlighting attributes as builtins " avoid highlighting attributes as builtins
syn match pythonAttribute /\.\h\w*/hs=s+1 syn match pythonAttribute /\.\h\w*/hs=s+1
\ contains=ALLBUT,pythonBuiltin,pythonFunction,pythonAsync \ contains=ALLBUT,pythonBuiltin,pythonFunction,pythonAsync
@ -224,28 +210,27 @@ if !exists("python_no_builtin_highlight")
endif endif
" From the 'Python Library Reference' class hierarchy at the bottom. " From the 'Python Library Reference' class hierarchy at the bottom.
" http://docs.python.org/2/library/exceptions.html " http://docs.python.org/library/exceptions.html
" http://docs.python.org/3/library/exceptions.html
if !exists("python_no_exception_highlight") if !exists("python_no_exception_highlight")
" builtin base exceptions (used mostly as base classes for other exceptions) " builtin base exceptions (used mostly as base classes for other exceptions)
syn keyword pythonExceptions BaseException Exception syn keyword pythonExceptions BaseException Exception
syn keyword pythonExceptions ArithmeticError BufferError syn keyword pythonExceptions ArithmeticError BufferError LookupError
syn keyword pythonExceptions LookupError
" builtin base exceptions removed in Python 3
syn keyword pythonExceptions EnvironmentError StandardError
" builtin exceptions (actually raised) " builtin exceptions (actually raised)
syn keyword pythonExceptions AssertionError AttributeError syn keyword pythonExceptions AssertionError AttributeError EOFError
syn keyword pythonExceptions EOFError FloatingPointError GeneratorExit syn keyword pythonExceptions FloatingPointError GeneratorExit ImportError
syn keyword pythonExceptions ImportError IndentationError syn keyword pythonExceptions IndentationError IndexError KeyError
syn keyword pythonExceptions IndexError KeyError KeyboardInterrupt syn keyword pythonExceptions KeyboardInterrupt MemoryError
syn keyword pythonExceptions MemoryError NameError NotImplementedError syn keyword pythonExceptions ModuleNotFoundError NameError
syn keyword pythonExceptions OSError OverflowError ReferenceError syn keyword pythonExceptions NotImplementedError OSError OverflowError
syn keyword pythonExceptions RuntimeError StopIteration SyntaxError syn keyword pythonExceptions RecursionError ReferenceError RuntimeError
syn keyword pythonExceptions StopAsyncIteration StopIteration SyntaxError
syn keyword pythonExceptions SystemError SystemExit TabError TypeError syn keyword pythonExceptions SystemError SystemExit TabError TypeError
syn keyword pythonExceptions UnboundLocalError UnicodeError syn keyword pythonExceptions UnboundLocalError UnicodeDecodeError
syn keyword pythonExceptions UnicodeDecodeError UnicodeEncodeError syn keyword pythonExceptions UnicodeEncodeError UnicodeError
syn keyword pythonExceptions UnicodeTranslateError ValueError syn keyword pythonExceptions UnicodeTranslateError ValueError
syn keyword pythonExceptions ZeroDivisionError syn keyword pythonExceptions ZeroDivisionError
" builtin exception aliases for OSError
syn keyword pythonExceptions EnvironmentError IOError WindowsError
" builtin OS exceptions in Python 3 " builtin OS exceptions in Python 3
syn keyword pythonExceptions BlockingIOError BrokenPipeError syn keyword pythonExceptions BlockingIOError BrokenPipeError
syn keyword pythonExceptions ChildProcessError ConnectionAbortedError syn keyword pythonExceptions ChildProcessError ConnectionAbortedError
@ -253,18 +238,13 @@ if !exists("python_no_exception_highlight")
syn keyword pythonExceptions ConnectionResetError FileExistsError syn keyword pythonExceptions ConnectionResetError FileExistsError
syn keyword pythonExceptions FileNotFoundError InterruptedError syn keyword pythonExceptions FileNotFoundError InterruptedError
syn keyword pythonExceptions IsADirectoryError NotADirectoryError syn keyword pythonExceptions IsADirectoryError NotADirectoryError
syn keyword pythonExceptions PermissionError ProcessLookupError syn keyword pythonExceptions PermissionError ProcessLookupError TimeoutError
syn keyword pythonExceptions RecursionError StopAsyncIteration
syn keyword pythonExceptions TimeoutError
" builtin exceptions deprecated/removed in Python 3
syn keyword pythonExceptions IOError VMSError WindowsError
" builtin warnings " builtin warnings
syn keyword pythonExceptions BytesWarning DeprecationWarning FutureWarning syn keyword pythonExceptions BytesWarning DeprecationWarning FutureWarning
syn keyword pythonExceptions ImportWarning PendingDeprecationWarning syn keyword pythonExceptions ImportWarning PendingDeprecationWarning
syn keyword pythonExceptions RuntimeWarning SyntaxWarning UnicodeWarning syn keyword pythonExceptions ResourceWarning RuntimeWarning
syn keyword pythonExceptions SyntaxWarning UnicodeWarning
syn keyword pythonExceptions UserWarning Warning syn keyword pythonExceptions UserWarning Warning
" builtin warnings in Python 3
syn keyword pythonExceptions ResourceWarning
endif endif
if exists("python_space_error_highlight") if exists("python_space_error_highlight")

42
src/nvim/po/sr.po
View File

@ -10,8 +10,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Vim(Serbian)\n" "Project-Id-Version: Vim(Serbian)\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-11-23 22:13+0400\n" "POT-Creation-Date: 2021-02-14 01:49+0400\n"
"PO-Revision-Date: 2020-11-27 00:43+0400\n" "PO-Revision-Date: 2021-02-14 01:54+0400\n"
"Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n" "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
"Language-Team: Serbian\n" "Language-Team: Serbian\n"
"Language: sr\n" "Language: sr\n"
@ -34,7 +34,7 @@ msgid "E610: No argument to delete"
msgstr "E610: Нема аргумента за брисање" msgstr "E610: Нема аргумента за брисање"
msgid "E249: window layout changed unexpectedly" msgid "E249: window layout changed unexpectedly"
msgstr "E249: распоред прозора се нечекивано променио" msgstr "E249: распоред прозора се неочекивано променио"
msgid "--Deleted--" msgid "--Deleted--"
msgstr "--Обрисано--" msgstr "--Обрисано--"
@ -370,7 +370,7 @@ msgstr ""
"празно да премостите)" "празно да премостите)"
msgid "E514: write error (file system full?)" msgid "E514: write error (file system full?)"
msgstr "E514: грешка при упису (систем фајллова је пун?)" msgstr "E514: грешка при упису (систем фајлова је пун?)"
msgid " CONVERSION ERROR" msgid " CONVERSION ERROR"
msgstr " ГРЕШКА КОНВЕРЗИЈЕ" msgstr " ГРЕШКА КОНВЕРЗИЈЕ"
@ -436,7 +436,7 @@ msgid "E901: gethostbyname() in channel_open()"
msgstr "E901: gethostbyname() у channel_open()" msgstr "E901: gethostbyname() у channel_open()"
msgid "E903: received command with non-string argument" msgid "E903: received command with non-string argument"
msgstr "E903: примњена команда са аргуменом који није стринг" msgstr "E903: примљена команда са аргументом који није стринг"
msgid "E904: last argument for expr/call must be a number" msgid "E904: last argument for expr/call must be a number"
msgstr "E904: последњи аргумент за expr/call мора бити број" msgstr "E904: последњи аргумент за expr/call мора бити број"
@ -1609,7 +1609,7 @@ msgid "E185: Cannot find color scheme '%s'"
msgstr "E185: Шема боја '%s' не може да се пронађе" msgstr "E185: Шема боја '%s' не може да се пронађе"
msgid "Greetings, Vim user!" msgid "Greetings, Vim user!"
msgstr "Поздрав, корисниче Vim-a" msgstr "Поздрав, корисниче програма Vim!"
msgid "E784: Cannot close last tab page" msgid "E784: Cannot close last tab page"
msgstr "E784: Последња картица не може да се затвори" msgstr "E784: Последња картица не може да се затвори"
@ -1636,7 +1636,7 @@ msgstr ""
"премошћавање)" "премошћавање)"
msgid "E186: No previous directory" msgid "E186: No previous directory"
msgstr "E186: Нема претгодног директоријума" msgstr "E186: Нема претходног директоријума"
msgid "E187: Unknown" msgid "E187: Unknown"
msgstr "E187: Непознато" msgstr "E187: Непознато"
@ -2483,7 +2483,7 @@ msgstr ""
#, c-format #, c-format
msgid "E250: Fonts for the following charsets are missing in fontset %s:" msgid "E250: Fonts for the following charsets are missing in fontset %s:"
msgstr "E250: Фонтови за следеће сетове карактера недостају у фонтсету %s:" msgstr "E250: У фонтсету %s недостају фонтови за следеће скупове карактера:"
#, c-format #, c-format
msgid "E252: Fontset name: %s" msgid "E252: Fontset name: %s"
@ -2491,7 +2491,7 @@ msgstr "E252: Име фонтсета: %s"
#, c-format #, c-format
msgid "Font '%s' is not fixed-width" msgid "Font '%s' is not fixed-width"
msgstr "Фонт %s' није фиксне ширине" msgstr "Фонт '%s' није фиксне ширине"
#, c-format #, c-format
msgid "E253: Fontset name: %s" msgid "E253: Fontset name: %s"
@ -2507,7 +2507,7 @@ msgstr "Фонт%d: %s"
#, c-format #, c-format
msgid "Font%d width is not twice that of font0" msgid "Font%d width is not twice that of font0"
msgstr "Ширина фонт%d није два пута већа од ширине фонт0" msgstr "Фонт%d није два пута шири од фонт0"
#, c-format #, c-format
msgid "Font0 width: %d" msgid "Font0 width: %d"
@ -6002,7 +6002,7 @@ msgstr "E414: група има поставке, highlight link се игнор
#, c-format #, c-format
msgid "E415: unexpected equal sign: %s" msgid "E415: unexpected equal sign: %s"
msgstr "E415: неочкиван знак једнакости: %s" msgstr "E415: неочекиван знак једнакости: %s"
#, c-format #, c-format
msgid "E416: missing equal sign: %s" msgid "E416: missing equal sign: %s"
@ -6371,7 +6371,7 @@ msgid "E177: Count cannot be specified twice"
msgstr "E177: Бројач не може да се наведе два пута" msgstr "E177: Бројач не може да се наведе два пута"
msgid "E178: Invalid default value for count" msgid "E178: Invalid default value for count"
msgstr "E178: Несправна подразумевана вредност за бројач" msgstr "E178: Неисправна подразумевана вредност за бројач"
msgid "E179: argument required for -complete" msgid "E179: argument required for -complete"
msgstr "E179: потребан је аргумент за -complete" msgstr "E179: потребан је аргумент за -complete"
@ -6491,7 +6491,7 @@ msgid "E124: Missing '(': %s"
msgstr "E124: Недостаје '(': %s" msgstr "E124: Недостаје '(': %s"
msgid "E862: Cannot use g: here" msgid "E862: Cannot use g: here"
msgstr "E862: g: не може овде да се користи" msgstr "E862: Овде не може да се користи g:"
#, c-format #, c-format
msgid "E932: Closure function should not be at top level: %s" msgid "E932: Closure function should not be at top level: %s"
@ -6602,14 +6602,14 @@ msgid ""
"Included patches: " "Included patches: "
msgstr "" msgstr ""
"\n" "\n"
"Укључене исправке: " "Укључене закрпе: "
msgid "" msgid ""
"\n" "\n"
"Extra patches: " "Extra patches: "
msgstr "" msgstr ""
"\n" "\n"
"Екстра исправке: " "Додатне закрпе: "
msgid "Modified by " msgid "Modified by "
msgstr "Модификовао " msgstr "Модификовао "
@ -6747,7 +6747,7 @@ msgid "Linking: "
msgstr "Повезивање: " msgstr "Повезивање: "
msgid " DEBUG BUILD" msgid " DEBUG BUILD"
msgstr " DEBUG ИЗДАЊЕ" msgstr " ДИБАГ ИЗДАЊЕ"
msgid "VIM - Vi IMproved" msgid "VIM - Vi IMproved"
msgstr "VIM - Vi IMproved" msgstr "VIM - Vi IMproved"
@ -6756,7 +6756,7 @@ msgid "version "
msgstr "верзија " msgstr "верзија "
msgid "by Bram Moolenaar et al." msgid "by Bram Moolenaar et al."
msgstr "написали Bram Moolenaar et al." msgstr "написали Брам Моленар и др."
msgid "Vim is open source and freely distributable" msgid "Vim is open source and freely distributable"
msgstr "Vim је отвореног кода и може слободно да се дистрибуира" msgstr "Vim је отвореног кода и може слободно да се дистрибуира"
@ -6792,13 +6792,13 @@ msgid "Running modeless, typed text is inserted"
msgstr "Безрежимски рад, умеће се откуцани текст" msgstr "Безрежимски рад, умеће се откуцани текст"
msgid "menu Edit->Global Settings->Toggle Insert Mode " msgid "menu Edit->Global Settings->Toggle Insert Mode "
msgstr "мени Уређивање->Глобална подешавања->Преклапај режим Уметање " msgstr "мени Уређивање->Општа подешавања->Режим Уметање (да/не) "
msgid " for two modes " msgid " for two modes "
msgstr " за два режима " msgstr " за два режима "
msgid "menu Edit->Global Settings->Toggle Vi Compatible" msgid "menu Edit->Global Settings->Toggle Vi Compatible"
msgstr "мени Уређивање->Глобална подешавања->Преклапај Vi Компатибилно" msgstr "мени Уређивање->Општа подешавања->'Vi' сагласно (да/не)"
msgid " for Vim defaults " msgid " for Vim defaults "
msgstr " за Vim подразумевано " msgstr " за Vim подразумевано "
@ -6976,11 +6976,11 @@ msgstr "E983: Дуплирани аргумент: %s"
#, c-format #, c-format
msgid "E475: Invalid value for argument %s" msgid "E475: Invalid value for argument %s"
msgstr "E475: Неважећa вредност за аргумент: %s" msgstr "E475: Неважећа вредност за аргумент: %s"
#, c-format #, c-format
msgid "E475: Invalid value for argument %s: %s" msgid "E475: Invalid value for argument %s: %s"
msgstr "E475: Неважећa вредност за аргумент %s: %s" msgstr "E475: Неважећа вредност за аргумент %s: %s"
#, c-format #, c-format
msgid "E15: Invalid expression: %s" msgid "E15: Invalid expression: %s"