diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-22 21:54:53 -0400 |
---|---|---|
committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-27 09:21:27 -0400 |
commit | d6cef4ef9d75556d9ae1c39c3fd0becb3939f621 (patch) | |
tree | b32387915f4b47475052b47591231d96acd9e504 | |
parent | 01a629ca03f00c03cf0d8a57114535d976c67592 (diff) | |
download | rneovim-d6cef4ef9d75556d9ae1c39c3fd0becb3939f621.tar.gz rneovim-d6cef4ef9d75556d9ae1c39c3fd0becb3939f621.tar.bz2 rneovim-d6cef4ef9d75556d9ae1c39c3fd0becb3939f621.zip |
vim-patch:8fe1000e9c34
Update runtime files
https://github.com/vim/vim/commit/8fe1000e9c3438d0ff36cf2340f0f0e48f8fb89f
Omit de.po changes.
There's too many lines to port and I don't understand the language.
-rw-r--r-- | runtime/nvim.desktop | 1 | ||||
-rw-r--r-- | runtime/syntax/debchangelog.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/debcopyright.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/debsources.vim | 6 | ||||
-rw-r--r-- | runtime/syntax/freebasic.vim | 33 | ||||
-rw-r--r-- | runtime/syntax/sshconfig.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/yaml.vim | 2 | ||||
-rw-r--r-- | src/nvim/po/sr.po | 10 |
8 files changed, 36 insertions, 28 deletions
diff --git a/runtime/nvim.desktop b/runtime/nvim.desktop index be6a2eda82..d08029d2b0 100644 --- a/runtime/nvim.desktop +++ b/runtime/nvim.desktop @@ -2,6 +2,7 @@ Name=Neovim GenericName=Text Editor GenericName[de]=Texteditor +GenericName[sr]=Едитор текста Comment=Edit text files Comment[af]=Redigeer tekslêers Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim index 9d6dfe96a5..2d612061f3 100644 --- a/runtime/syntax/debchangelog.vim +++ b/runtime/syntax/debchangelog.vim @@ -3,7 +3,7 @@ " Maintainer: Debian Vim Maintainers " Former Maintainers: Gerfried Fuchs <alfie@ist.org> " Wichert Akkerman <wakkerma@debian.org> -" Last Change: 2019 Apr 21 +" Last Change: 2019 Sep 07 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim " Standard syntax initialization @@ -21,7 +21,7 @@ let s:binNMU='binary-only=yes' syn match debchangelogName contained "^[[:alnum:]][[:alnum:].+-]\+ " exe 'syn match debchangelogFirstKV contained "; \('.s:urgency.'\|'.s:binNMU.'\)"' exe 'syn match debchangelogOtherKV contained ", \('.s:urgency.'\|'.s:binNMU.'\)"' -syn match debchangelogTarget contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(squeeze|wheezy|jessie)-%(backports%(-sloppy)=|lts|security)|stretch%(-backports%(-sloppy)=|-security)=|buster%(-backports|-security)=|bullseye|%(devel|precise|trusty|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic|disco|eoan)%(-%(security|proposed|updates|backports|commercial|partner))=)+" +syn match debchangelogTarget contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(squeeze|wheezy|jessie)-%(backports%(-sloppy)=|lts|security)|stretch%(-backports%(-sloppy)=|-security)=|buster%(-backports|-security)=|bullseye|bookworm|%(devel|precise|trusty|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic|disco|eoan)%(-%(security|proposed|updates|backports|commercial|partner))=)+" syn match debchangelogVersion contained "(.\{-})" syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*" syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*" diff --git a/runtime/syntax/debcopyright.vim b/runtime/syntax/debcopyright.vim index c85ca372d0..c87b876eea 100644 --- a/runtime/syntax/debcopyright.vim +++ b/runtime/syntax/debcopyright.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Debian copyright file " Maintainer: Debian Vim Maintainers -" Last Change: 2018 Feb 05 +" Last Change: 2019 Sep 07 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcopyright.vim " Standard syntax initialization @@ -15,7 +15,7 @@ set cpo&vim syn case match syn match debcopyrightUrl "\vhttps?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$" -syn match debcopyrightKey "^\%(Format\|Upstream-Name\|Upstream-Contact\|Disclaimer\|Source\|Comment\|Files\|Copyright\|License\): *" +syn match debcopyrightKey "^\%(Format\|Upstream-Name\|Upstream-Contact\|Disclaimer\|Source\|Comment\|Files\|Copyright\|License\|Files-Excluded\%(-[-a-zA-Z0-9]\+\)\=\): *" syn match debcopyrightEmail "[_=[:alnum:]\.+-]\+@[[:alnum:]\./\-]\+" syn match debcopyrightEmail "<.\{-}>" syn match debcopyrightComment "^#.*$" contains=@Spell diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim index f90476fe25..97acbf60fc 100644 --- a/runtime/syntax/debsources.vim +++ b/runtime/syntax/debsources.vim @@ -2,7 +2,7 @@ " Language: Debian sources.list " Maintainer: Debian Vim Maintainers " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl> -" Last Change: 2019 Apr 21 +" Last Change: 2019 Sep 07 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim " Standard syntax initialization @@ -26,7 +26,7 @@ let s:supported = [ \ 'wheezy', 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm', \ 'sid', 'rc-buggy', \ - \ 'trusty', 'xenial', 'bionic', 'cosmic', 'disco', 'eoan', 'devel' + \ 'trusty', 'xenial', 'bionic', 'disco', 'eoan', 'devel' \ ] let s:unsupported = [ \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato', @@ -35,7 +35,7 @@ let s:unsupported = [ \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty', \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid', \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy', - \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful' + \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic' \ ] let &cpo=s:cpo diff --git a/runtime/syntax/freebasic.vim b/runtime/syntax/freebasic.vim index bce7f9ebc1..68e838f393 100644 --- a/runtime/syntax/freebasic.vim +++ b/runtime/syntax/freebasic.vim @@ -1,12 +1,13 @@ " Vim syntax file " Language: FreeBasic -" Maintainer: Mark Manning <markem@airmail.net> -" Updated: 10/22/2006 +" Maintainer: Mark Manning <markem@sim1.us> +" Updated: 10/9/2019 +" Version: 7.0b " " Description: " " Based originally on the work done by Allan Kelly <Allan.Kelly@ed.ac.uk> -" Updated by Mark Manning <markem@airmail.net> +" Updated by Mark Manning <markem@sim1.us> " Applied FreeBasic support to the already excellent support " for standard basic syntax (like QB). " @@ -138,7 +139,7 @@ syn keyword freebasicUserInput GETJOYSTICK GETKEY GETMOUSE INKEY INPUT MULTIKEY " types of identifiers like functions, basic commands and " such. MEM 9/9/2006 " -syn match freebasicIdentifier "\<[a-zA-Z_][a-zA-Z0-9_]*\>" +syn match freebasicIdentifier "\<[a-zA-Z_][a-zA-Z0-9_]*\>" syn match freebasicGenericFunction "\<[a-zA-Z_][a-zA-Z0-9_]*\>\s*("me=e-1,he=e-1 " " Function list @@ -154,9 +155,13 @@ syn cluster freebasicParenGroup contains=freebasicParenError,freebasicSpecial,fr " " Integer number, or floating point number without a dot and with "f". " -syn region freebasicHex start="&h" end="\W" -syn region freebasicHexError start="&h\x*[g-zG-Z]" end="\W" -syn match freebasicInteger "\<\d\+\(u\=l\=\|lu\|f\)\>" +syn region freebasicHex start="&h" end="\W" +syn region freebasicHexError start="&h\x*[g-zG-Z]" end="\W" +syn region freebasicOctal start="&o" end="\W" +syn region freebasicOctalError start="&o[0-7]*[89a-zA-Z]" end="\W" +syn region freebasicBinary start="&b" end="\W" +syn region freebasicBinaryError start="&b[01]*[2-9a-zA-Z]" end="\W" +syn match freebasicInteger "\<\d\+\(u\=l\=\|lu\|f\)\>" " " Floating point number, with dot, optional exponent " @@ -170,11 +175,11 @@ syn match freebasicFloat "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>" " syn match freebasicFloat "\<\d\+e[-+]\=\d\+[fl]\=\>" " -" Hex number +" Octal number " syn case match -syn match freebasicOctal "\<0\o*\>" -syn match freebasicOctalError "\<0\o*[89]" +syn match freebasicOctal2 "\<0\o*\>" +syn match freebasicOctal2Error "\<0\o*[89a-zA-Z]" " " String and Character contstants " @@ -183,7 +188,7 @@ syn region freebasicString start="'" end="'" contains=freebasicSpecial,freebasi " " Comments " -syn match freebasicSpecial contained "\\." +syn match freebasicSpecial contained "\\\\." syn region freebasicComment start="^rem" end="$" contains=freebasicSpecial,freebasicTodo syn region freebasicComment start=":\s*rem" end="$" contains=freebasicSpecial,freebasicTodo syn region freebasicComment start="\s*'" end="$" contains=freebasicSpecial,freebasicTodo @@ -197,12 +202,12 @@ syn region freebasicLineNumber start="^\d" end="\s" " " Create the clusters " -syn cluster freebasicNumber contains=freebasicHex,freebasicOctal,freebasicInteger,freebasicFloat -syn cluster freebasicError contains=freebasicHexError,freebasicOctalError +syn cluster freebasicNumber contains=freebasicHex,freebasicOctal,freebasicOctal2,freebasicBinary,freebasicInteger,freebasicFloat +syn cluster freebasicError contains=freebasicHexError,freebasicOctalError,freebasicOctal2,freebasicBinary " " Used with OPEN statement " -syn match freebasicFilenumber "#\d\+" +syn match freebasicFilenumber "#\d\+" syn match freebasicMathOperator "[\+\-\=\|\*\/\>\<\%\()[\]]" contains=freebasicParen " " The default methods for highlighting. Can be overridden later diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim index 755d08e768..6c36f56af8 100644 --- a/runtime/syntax/sshconfig.vim +++ b/runtime/syntax/sshconfig.vim @@ -5,7 +5,8 @@ " Contributor: Leonard Ehrenfried <leonard.ehrenfried@web.de> " Contributor: Karsten Hopp <karsten@redhat.com> " Contributor: Dean, Adam Kenneth <adam.ken.dean@hpe.com> -" Last Change: 2016 Dec 28 +" Last Change: 2019 Sep 09 +" Added RemoteCommand from pull request #4809 " SSH Version: 7.4p1 " @@ -206,6 +207,7 @@ syn keyword sshconfigKeyword PubkeyAcceptedKeyTypes syn keyword sshconfigKeyword PubkeyAuthentication syn keyword sshconfigKeyword RSAAuthentication syn keyword sshconfigKeyword RekeyLimit +syn keyword sshconfigKeyword RemoteCommand syn keyword sshconfigKeyword RemoteForward syn keyword sshconfigKeyword RequestTTY syn keyword sshconfigKeyword RhostsRSAAuthentication diff --git a/runtime/syntax/yaml.vim b/runtime/syntax/yaml.vim index 626dc8a77f..49f7d049a7 100644 --- a/runtime/syntax/yaml.vim +++ b/runtime/syntax/yaml.vim @@ -3,6 +3,7 @@ " Maintainer: Nikolai Pavlov <zyx.vim@gmail.com> " First author: Nikolai Weibull <now@bitwi.se> " Latest Revision: 2015-03-28 +" removed duplicate yamlKeyValueDelimiter (pull #4799) if exists('b:current_syntax') finish @@ -150,7 +151,6 @@ syn match yamlBlockMappingMerge /^\s*\zs<<\ze:\%(\s\|$\)/ nextgroup=yamlKeyValue syn match yamlBlockMappingMerge /<<\ze\s*:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter contained syn match yamlKeyValueDelimiter /\s*:/ contained -syn match yamlKeyValueDelimiter /\s*:/ contained syn cluster yamlScalarWithSpecials contains=yamlPlainScalar,yamlBlockMappingKey,yamlFlowMappingKey diff --git a/src/nvim/po/sr.po b/src/nvim/po/sr.po index a93a2ec584..7bcec22d8a 100644 --- a/src/nvim/po/sr.po +++ b/src/nvim/po/sr.po @@ -3320,21 +3320,21 @@ msgid "" "mark line col file/text" msgstr "" "\n" -"линија маркера кол датотека/текст" +"марк лин кол фајл/текст" msgid "" "\n" " jump line col file/text" msgstr "" "\n" -" линија скока кол датотека/текст" +" скок лин кол фајл/текст" msgid "" "\n" "change line col text" msgstr "" "\n" -"линија промене кол текст" +"измена лин кол текст" msgid "" "\n" @@ -3964,7 +3964,7 @@ msgid "E767: Too many arguments to printf()" msgstr "E767: Сувише аргумената за printf()" msgid "W10: Warning: Changing a readonly file" -msgstr "W10: Упозорење: Мења се датотека која може само да се чита" +msgstr "W10: Упозорење: Мења се фајл који може само да се чита" msgid "Type number and <Enter> or click with mouse (empty cancels): " msgstr "Унесите број и <Enter> или кликните мишем (ништа за отказ): " @@ -6711,7 +6711,7 @@ msgid "E255: Couldn't read in sign data!" msgstr "E255: Подаци за знак нису могли да се прочитају!" msgid "E72: Close error on swap file" -msgstr "E72: Грешка код затвањара swap датотеке" +msgstr "E72: Грешка код затварања swap фајла" msgid "E73: tag stack empty" msgstr "E73: стек ознака је празан" |