diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-29 18:34:49 -0400 |
---|---|---|
committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-29 20:42:16 -0400 |
commit | 09f3e62bc623dd3cbcbc708b019b55a8b9449de7 (patch) | |
tree | 5d8601e128af24b13a6c8e873ac4f0eef999a6f0 | |
parent | 0a0034718c00fd9f434d20d29e415287db284bbe (diff) | |
download | rneovim-09f3e62bc623dd3cbcbc708b019b55a8b9449de7.tar.gz rneovim-09f3e62bc623dd3cbcbc708b019b55a8b9449de7.tar.bz2 rneovim-09f3e62bc623dd3cbcbc708b019b55a8b9449de7.zip |
vim-patch:e7b1ea0276cc
Update runtime files.
https://github.com/vim/vim/commit/e7b1ea0276cc83cd5c612f3189a174a60d57b5ed
-rw-r--r-- | runtime/doc/autocmd.txt | 4 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 25 | ||||
-rw-r--r-- | runtime/doc/helphelp.txt | 18 | ||||
-rw-r--r-- | runtime/doc/indent.txt | 28 | ||||
-rw-r--r-- | runtime/doc/options.txt | 11 | ||||
-rw-r--r-- | runtime/doc/syntax.txt | 14 | ||||
-rw-r--r-- | runtime/doc/usr_04.txt | 2 | ||||
-rw-r--r-- | runtime/doc/usr_05.txt | 4 | ||||
-rw-r--r-- | runtime/doc/usr_20.txt | 8 | ||||
-rw-r--r-- | runtime/doc/usr_30.txt | 2 | ||||
-rw-r--r-- | runtime/doc/usr_31.txt | 4 | ||||
-rw-r--r-- | runtime/doc/usr_40.txt | 6 | ||||
-rw-r--r-- | runtime/doc/usr_41.txt | 4 | ||||
-rw-r--r-- | runtime/doc/usr_42.txt | 4 | ||||
-rw-r--r-- | runtime/doc/usr_toc.txt | 2 | ||||
-rw-r--r-- | runtime/doc/visual.txt | 8 | ||||
-rw-r--r-- | runtime/ftplugin/vim.vim | 2 | ||||
-rw-r--r-- | runtime/keymap/turkish-f.vim | 114 | ||||
-rw-r--r-- | runtime/keymap/turkish-q.vim | 62 | ||||
-rw-r--r-- | runtime/syntax/css.vim | 9 | ||||
-rw-r--r-- | runtime/syntax/fstab.vim | 6 | ||||
-rw-r--r-- | runtime/syntax/help.vim | 2 | ||||
-rw-r--r-- | runtime/syntax/pamconf.vim | 37 |
23 files changed, 286 insertions, 90 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index cd789e6466..146f5bb533 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1209,8 +1209,8 @@ name! :aug[roup]! {name} Delete the autocmd group {name}. Don't use this if there is still an autocommand using this group! You will get a warning if doing - it anyway. when the group is the current group - you will get error E936. + it anyway. When the group is the current + group you will get error E936. To enter autocommands for a specific group, use this method: 1. Select the group with ":augroup {name}". diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index e79f97ee38..5a1f8cea54 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -4164,28 +4164,29 @@ getbufinfo([{dict}]) Each returned List item is a dictionary with the following entries: - bufnr buffer number. + bufnr Buffer number. changed TRUE if the buffer is modified. - changedtick number of changes made to the buffer. + changedtick Number of changes made to the buffer. hidden TRUE if the buffer is hidden. - lastused timestamp in seconds, like + lastused Timestamp in seconds, like |localtime()|, when the buffer was last used. listed TRUE if the buffer is listed. - lnum current line number in buffer. - linecount number of lines in the buffer (only + lnum Line number used for the buffer when + opened in the current window. + linecount Number of lines in the buffer (only valid when loaded) loaded TRUE if the buffer is loaded. - name full path to the file in the buffer. - signs list of signs placed in the buffer. + name Full path to the file in the buffer. + signs List of signs placed in the buffer. Each list item is a dictionary with the following fields: id sign identifier lnum line number name sign name - variables a reference to the dictionary with + variables A reference to the dictionary with buffer-local variables. - windows list of |window-ID|s that display this + windows List of |window-ID|s that display this buffer Examples: > @@ -4621,7 +4622,7 @@ getloclist({nr},[, {what}]) *getloclist()* :echo getloclist(5, {'filewinid': 0}) -getmarklist([{expr}] *getmarklist()* +getmarklist([{expr}]) *getmarklist()* Without the {expr} argument returns a |List| with information about all the global marks. |mark| @@ -7814,7 +7815,7 @@ settagstack({nr}, {dict} [, {action}]) *settagstack()* Returns zero for success, -1 for failure. - Examples (for more examples see |tagstack-examples||): + Examples (for more examples see |tagstack-examples|): Empty the tag stack of window 3: > call settagstack(3, {'items' : []}) @@ -8461,7 +8462,7 @@ swapname({expr}) *swapname()* The result is the swap file path of the buffer {expr}. For the use of {expr}, see |bufname()| above. If buffer {expr} is the current buffer, the result is equal to - |:swapname| (unless no swap file). + |:swapname| (unless there is no swap file). If buffer {expr} has no swap file, returns an empty string. synID({lnum}, {col}, {trans}) *synID()* diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt index c9bee17d70..ab14023137 100644 --- a/runtime/doc/helphelp.txt +++ b/runtime/doc/helphelp.txt @@ -369,14 +369,16 @@ highlighting. So do these: You can find the details in $VIMRUNTIME/syntax/help.vim *inclusion* -Some people make a big deal about using "his" when referring to the user, -thinking it means we assume the user is male. That is of course not the case, -it's just a habit of writing help text, which quite often is many years old. -Also, a lot of the text is written by contributors for who English is not -their first language. We do not make any assumptions about the gender of the -user, no matter how the text is phrased. And we do not want to waste time on -this discussion. The goal is that the reader understands how Vim works, the -exact wording is secondary. +Vim is for everybody, no matter race, gender or anything. Some people make a +big deal about using "he" or "his" when referring to the user, thinking it +means we assume the user is male. That is not the case, it's just a habit of +writing help text, which quite often is many years old. Also, a lot of the +text is written by contributors for whom English is not their first language. +We do not make any assumptions about the gender of the user, no matter how the +text is phrased. Some people have suggested using "they", but that is not +regular English. We do not want to spend much time on this discussion. The +goal is that the reader understands how Vim works, the exact wording is +secondary. vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index 4113564169..dd6f0d901d 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -410,11 +410,11 @@ The examples below assume a 'shiftwidth' of 4. < *cino-(* (N When in unclosed parentheses, indent N characters from the line - with the unclosed parentheses. Add a 'shiftwidth' for every + with the unclosed parenthesis. Add a 'shiftwidth' for every extra unclosed parentheses. When N is 0 or the unclosed - parentheses is the first non-white character in its line, line + parenthesis is the first non-white character in its line, line up with the next non-white character after the unclosed - parentheses. (default 'shiftwidth' * 2). + parenthesis. (default 'shiftwidth' * 2). cino= cino=(0 > if (c1 && (c2 || if (c1 && (c2 || @@ -435,7 +435,7 @@ The examples below assume a 'shiftwidth' of 4. < *cino-U* UN When N is non-zero, do not ignore the indenting specified by - ( or u in case that the unclosed parentheses is the first + ( or u in case that the unclosed parenthesis is the first non-white character in its line. (default 0). cino= or cino=(s cino=(s,U1 > @@ -448,8 +448,8 @@ The examples below assume a 'shiftwidth' of 4. *cino-w* wN When in unclosed parentheses and N is non-zero and either using "(0" or "u0", respectively, or using "U0" and the unclosed - parentheses is the first non-white character in its line, line - up with the character immediately after the unclosed parentheses + parenthesis is the first non-white character in its line, line + up with the character immediately after the unclosed parenthesis rather than the first non-white character. (default 0). cino=(0 cino=(0,w1 > @@ -460,11 +460,11 @@ The examples below assume a 'shiftwidth' of 4. < *cino-W* WN When in unclosed parentheses and N is non-zero and either - using "(0" or "u0", respectively and the unclosed parentheses is + using "(0" or "u0", respectively and the unclosed parenthesis is the last non-white character in its line and it is not the - closing parentheses, indent the following line N characters + closing parenthesis, indent the following line N characters relative to the outer context (i.e. start of the line or the - next unclosed parentheses). (default: 0). + next unclosed parenthesis). (default: 0). cino=(0 cino=(0,W4 > a_long_line( a_long_line( @@ -491,8 +491,8 @@ The examples below assume a 'shiftwidth' of 4. < *cino-m* mN When N is non-zero, line up a line starting with a closing - parentheses with the first character of the line with the - matching opening parentheses. (default 0). + parenthesis with the first character of the line with the + matching opening parenthesis. (default 0). cino=(s cino=(s,m1 > c = c1 && ( c = c1 && ( @@ -506,7 +506,7 @@ The examples below assume a 'shiftwidth' of 4. < *cino-M* MN When N is non-zero, line up a line starting with a closing - parentheses with the first character of the previous line. + parenthesis with the first character of the previous line. (default 0). cino= cino=M1 > @@ -565,7 +565,7 @@ The examples below assume a 'shiftwidth' of 4. recognize preprocessor lines; right-shifting lines that start with "#" does not work. - + *cino-P* PN When N is non-zero recognize C pragmas, and indent them like any other code; does not concern other preprocessor directives. When N is zero (default): don't recognize C pragmas, treating @@ -992,7 +992,7 @@ Indent after a nested paren: > Indent for a continuation line: > let g:pyindent_continue = 'shiftwidth() * 2' -The method uses |searchpair()| to look back for unclosed parenthesis. This +The method uses |searchpair()| to look back for unclosed parentheses. This can sometimes be slow, thus it timeouts after 150 msec. If you notice the indenting isn't correct, you can set a larger timeout in msec: > let g:pyindent_searchpair_timeout = 500 diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 23354c0320..ef2957fcbe 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2012,6 +2012,8 @@ A jump table for the options with a short description can be found at |Q_op|. 'directory' 'dir' string (default "$XDG_DATA_HOME/nvim/swap//") global List of directory names for the swap file, separated with commas. + + Possible items: - The swap file will be created in the first directory where this is possible. If it is not possible in any directory, but last directory listed in the option does not exist, it is created. @@ -2047,9 +2049,10 @@ A jump table for the options with a short description can be found at |Q_op|. the same file twice will result in a warning. Using "/tmp" on Unix is discouraged: When the system crashes you lose the swap file. "/var/tmp" is often not cleared when rebooting, thus is a better - choice than "/tmp". But it can contain a lot of files, your swap - files get lost in the crowd. That is why a "tmp" directory in your - home directory is tried first. + choice than "/tmp". But others on the computer may be able to see the + files, and it can contain a lot of files, your swap files get lost in + the crowd. That is why a "tmp" directory in your home directory is + tried first. The use of |:set+=| and |:set-=| is preferred when adding or removing directories from the list. This avoids problems when a future version uses another default. @@ -6622,7 +6625,7 @@ A jump table for the options with a short description can be found at |Q_op|. >= 14 Anything pending in a ":finally" clause. >= 15 Every executed Ex command from a script (truncated at 200 characters). - >= 16 Every executed Ex command + >= 16 Every executed Ex command. This option can also be set with the "-V" argument. See |-V|. This option is also set by the |:verbose| command. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index f0aded842c..fa9a8bbd2b 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -3603,7 +3603,7 @@ DEFINING FOLDLEVEL *:syn-foldlevel* start: Use level of item containing start of line. minimum: Use lowest local-minimum level of items on line. - The default is 'start'. Use 'minimum' to search a line horizontally + The default is "start". Use "minimum" to search a line horizontally for the lowest level contained on the line that is followed by a higher level. This produces more natural folds when syntax items may close and open horizontally within a line. @@ -3748,9 +3748,9 @@ DEFINING REGIONS *:syn-region* *:syn-start* *:syn-skip* *:syn-end* [keepend] [extend] [excludenl] - start={start_pattern} .. - [skip={skip_pattern}] - end={end_pattern} .. + start={start-pattern} .. + [skip={skip-pattern}] + end={end-pattern} .. [{options}] This defines one region. It may span several lines. @@ -3772,12 +3772,12 @@ DEFINING REGIONS *:syn-region* *:syn-start* *:syn-skip* *:syn-end* extend a containing match or item. Only useful for end patterns. Must be given before the patterns it applies to. |:syn-excludenl| - start={start_pattern} The search pattern that defines the start of + start={start-pattern} The search pattern that defines the start of the region. See |:syn-pattern| below. - skip={skip_pattern} The search pattern that defines text inside + skip={skip-pattern} The search pattern that defines text inside the region where not to look for the end pattern. See |:syn-pattern| below. - end={end_pattern} The search pattern that defines the end of + end={end-pattern} The search pattern that defines the end of the region. See |:syn-pattern| below. Example: > diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt index 23270e3154..f59597eb42 100644 --- a/runtime/doc/usr_04.txt +++ b/runtime/doc/usr_04.txt @@ -161,7 +161,7 @@ line break. ============================================================================== *04.3* Repeating a change -The "." command is one of the most simple yet powerful commands in Vim. It +The "." command is one of the simplest yet powerful commands in Vim. It repeats the last change. For instance, suppose you are editing an HTML file and want to delete all the <B> tags. You position the cursor on the first < and delete the <B> with the command "df>". You then go to the < of the next diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index 70a0ad97c1..d8634ac6ed 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -45,8 +45,8 @@ This file is always used and is recommended: ~/AppData/Local/nvim/init.vim (Windows) ~ The vimrc file can contain all the commands that you type after a colon. The -most simple ones are for setting options. For example, if you want Vim to -always start with the 'ignorecase' option on, add this line your vimrc file: > +simplest ones are for setting options. For example, if you want Vim to always +start with the 'incsearch' option on, add this line your vimrc file: > set ignorecase diff --git a/runtime/doc/usr_20.txt b/runtime/doc/usr_20.txt index 8eee7aedb7..29252705d6 100644 --- a/runtime/doc/usr_20.txt +++ b/runtime/doc/usr_20.txt @@ -327,10 +327,10 @@ for next. ============================================================================== *20.5* Command line window -Typing the text in the command line works different from typing text in Insert -mode. It doesn't allow many commands to change the text. For most commands -that's OK, but sometimes you have to type a complicated command. That's where -the command line window is useful. +Typing the text in the command line works differently from typing text in +Insert mode. It doesn't allow many commands to change the text. For most +commands that's OK, but sometimes you have to type a complicated command. +That's where the command line window is useful. Open the command line window with this command: > diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt index b729c7a263..98d1780cc4 100644 --- a/runtime/doc/usr_30.txt +++ b/runtime/doc/usr_30.txt @@ -336,7 +336,7 @@ How to do that is explained here: |indent-expression|. ============================================================================== *30.4* Other indenting -The most simple form of automatic indenting is with the 'autoindent' option. +The simplest form of automatic indenting is with the 'autoindent' option. It uses the indent from the previous line. A bit smarter is the 'smartindent' option. This is useful for languages where no indent file is available. 'smartindent' is not as smart as 'cindent', but smarter than 'autoindent'. diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt index 74de3f1042..a35f392324 100644 --- a/runtime/doc/usr_31.txt +++ b/runtime/doc/usr_31.txt @@ -198,9 +198,9 @@ is not possible in most terminals. You can start the X-Windows version of gvim with an argument to specify the size and position of the window: > - gvim -geometry {width}x{height}+{x_offset}+{y_offset} + gvim -geometry {width}x{height}+{x-offset}+{y-offset} -{width} and {height} are in characters, {x_offset} and {y_offset} are in +{width} and {height} are in characters, {x-offset} and {y-offset} are in pixels. Example: > gvim -geometry 80x25+100+300 diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt index 9a1fe50f31..5b1254e2ae 100644 --- a/runtime/doc/usr_40.txt +++ b/runtime/doc/usr_40.txt @@ -453,12 +453,12 @@ matching BufWritePre autocommands and executes them, and then it performs the ":write". The general form of the :autocmd command is as follows: > - :autocmd [group] {events} {file_pattern} [++nested] {command} + :autocmd [group] {events} {file-pattern} [++nested] {command} The [group] name is optional. It is used in managing and calling the commands (more on this later). The {events} parameter is a list of events (comma separated) that trigger the command. - {file_pattern} is a filename, usually with wildcards. For example, using + {file-pattern} is a filename, usually with wildcards. For example, using "*.txt" makes the autocommand be used for all files whose name end in ".txt". The optional [++nested] flag allows for nesting of autocommands (see below), and finally, {command} is the command to be executed. @@ -489,7 +489,7 @@ See |autocmd-events| for a complete list of events. PATTERNS -The {file_pattern} argument can actually be a comma-separated list of file +The {file-pattern} argument can actually be a comma-separated list of file patterns. For example: "*.c,*.h" matches files ending in ".c" and ".h". The usual file wildcards can be used. Here is a summary of the most often used ones: diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index fcf49c92ac..94d0422818 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -44,7 +44,7 @@ script file. You can think of other uses yourself. If you are familiar with Python, you can find a comparison between Python and Vim script here, with pointers to other documents: https://gist.github.com/yegappan/16d964a37ead0979b05e655aa036cad0 - And if you are familiar with Javascript: + And if you are familiar with JavaScript: https://w0rp.com/blog/post/vim-script-for-the-javascripter/ Let's start with a simple example: > @@ -1960,7 +1960,7 @@ Thus when a user types "\a", this sequence is invoked: > \a -> <Plug>TypecorrAdd -> <SID>Add -> :call <SID>Add() -If another script would also map <SID>Add, it would get another script ID and +If another script was also map <SID>Add, it would get another script ID and thus define another mapping. Note that instead of s:Add() we use <SID>Add() here. That is because the diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt index 501f02e745..99da1359c2 100644 --- a/runtime/doc/usr_42.txt +++ b/runtime/doc/usr_42.txt @@ -209,8 +209,8 @@ argument: > :amenu <silent> Mine.Next\ File :call <SID>NextFile()<CR> Don't use "<silent>" too often. It is not needed for short commands. If you -make a menu for someone else, being able the see the executed command will -give him a hint about what he could have typed, instead of using the mouse. +make a menu for someone else, being able to see the executed command will give +him a hint about what he could have typed, instead of using the mouse. LISTING MENUS diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt index eb6dda84bb..f466a8ece9 100644 --- a/runtime/doc/usr_toc.txt +++ b/runtime/doc/usr_toc.txt @@ -327,7 +327,7 @@ Make Vim work as you like it. |44.11| Installing a syntax file |44.12| Portable syntax file layout -|usr_45.txt| Select your language +|usr_45.txt| Select your language (locale) |45.1| Language for Messages |45.2| Language for Menus |45.3| Using another encoding diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt index 2fefdb5222..f7828f0289 100644 --- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -112,7 +112,7 @@ gN Like |gn| but searches backward, like with `N`. *<LeftMouse>* <LeftMouse> Set the current cursor position. If Visual mode is - active it is stopped. Only when 'mouse' option is + active it is stopped. Only when 'mouse' option contains 'n' or 'a'. If the position is within 'so' lines from the last line on the screen the text is scrolled up. If the position is within 'so' lines from @@ -123,7 +123,7 @@ gN Like |gn| but searches backward, like with `N`. <RightMouse> Start Visual mode if it is not active. The text from the cursor position to the position of the click is highlighted. If Visual mode was already active move - the start or end of the highlighted text, which ever + the start or end of the highlighted text, whichever is closest, to the position of the click. Only when 'mouse' option contains 'n' or 'a'. @@ -226,7 +226,7 @@ The objects that can be used are: is inner sentence |v_is| ap a paragraph (with white space) |v_ap| ip inner paragraph |v_ip| - ab a () block (with parenthesis) |v_ab| + ab a () block (with parentheses) |v_ab| ib inner () block |v_ib| aB a {} block (with braces) |v_aB| iB inner {} block |v_iB| @@ -337,7 +337,7 @@ Visual-block Shift *v_b_>* The block is shifted by 'shiftwidth'. The RHS of the block is irrelevant. The LHS of the block determines the point from which to apply a right shift, and padding includes TABs optimally according to 'ts' and 'et'. The LHS of the -block determines the point upto which to shift left. +block determines the point up to which to shift left. See |v_b_>_example|. See |v_b_<_example|. diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim index ee189e39c0..9369f7c63c 100644 --- a/runtime/ftplugin/vim.vim +++ b/runtime/ftplugin/vim.vim @@ -86,7 +86,7 @@ endif if exists("loaded_matchit") let b:match_ignorecase = 0 let b:match_words = - \ '\<\%(fu\%[nction]\|def\)\>[^(]:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' . + \ '\<\%(fu\%[nction]\|def\)\>)\@!:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' . \ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' . \ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' . \ '{:},' . diff --git a/runtime/keymap/turkish-f.vim b/runtime/keymap/turkish-f.vim new file mode 100644 index 0000000000..a2774dbfff --- /dev/null +++ b/runtime/keymap/turkish-f.vim @@ -0,0 +1,114 @@ +" Vim keymap file for Turkish F layout +" Maintainer: Emir SARI <bitigchi@me.com> +" Last changed: 5 August 2020 + +scriptencoding utf-8 +let b:keymap_name = "tr-f" +loadkeymap + +F A LATIN CAPITAL LETTER A +< B LATIN CAPITAL LETTER B +V C LATIN CAPITAL LETTER C +B Ç LATIN CAPITAL LETTER C WITH CEDILLA +Y D LATIN CAPITAL LETTER D +D E LATIN CAPITAL LETTER E +Q F LATIN CAPITAL LETTER F +W G LATIN CAPITAL LETTER G +E Ğ LATIN CAPITAL LETTER G WITH BREVE +O H LATIN CAPITAL LETTER H +R I LATIN CAPITAL LETTER I +S İ LATIN CAPITAL LETTER I WITH DOT ABOVE +Z J LATIN CAPITAL LETTER J +J K LATIN CAPITAL LETTER K +K M LATIN CAPITAL LETTER M +I N LATIN CAPITAL LETTER N +T O LATIN CAPITAL LETTER O +X Ö LATIN CAPITAL LETTER O WITH DIAERESIS +U R LATIN CAPITAL LETTER R +M S LATIN CAPITAL LETTER S +\" Ş LATIN CAPITAL LETTER S WITH CEDILLA +H T LATIN CAPITAL LETTER T +A U LATIN CAPITAL LETTER U +G Ü LATIN CAPITAL LETTER U WITH DIAERESIS +C V LATIN CAPITAL LETTER V +: Y LATIN CAPITAL LETTER Y +N Z LATIN CAPITAL LETTER Z + +{ Q LATIN CAPITAL LETTER Q +} W LATIN CAPITAL LETTER W +| X LATIN CAPITAL LETTER X + +± * ASTERISK +@ " QUOTATION MARK +# ^ CIRCUMFLEX ACCENT +^ & AMPERSAND +& ' APOSTROPHE +* ( LEFT PARENTHESIS +( ) RIGHT PARENTHESIS +) = EQUALS SIGN +_ ? QUESTION MARK ++ _ LOW LINE +> : COLON +? ; SEMICOLON +~ > GREATER-THAN SIGN + +Å Û LATIN CAPITAL LETTER U WITH CIRCUMFLEX +Í Î LATIN CAPITAL LETTER I WITH CIRCUMFLEX +Ï Â LATIN CAPITAL LETTER A WITH CIRCUMFLEX +` » RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK + +f a LATIN SMALL LETTER A +, b LATIN SMALL LETTER B +v c LATIN SMALL LETTER C +b ç LATIN SMALL LETTER C WITH CEDILLA +y d LATIN SMALL LETTER D +d e LATIN SMALL LETTER E +q f LATIN SMALL LETTER F +w g LATIN SMALL LETTER G +e ğ LATIN SMALL LETTER G WITH BREVE +o h LATIN SMALL LETTER H +r ı LATIN SMALL LETTER I +s i LATIN SMALL LETTER I WITH DOT ABOVE +z j LATIN SMALL LETTER J +j k LATIN SMALL LETTER K +k m LATIN SMALL LETTER M +i n LATIN SMALL LETTER N +t o LATIN SMALL LETTER O +x ö LATIN SMALL LETTER O WITH DIAERESIS +u r LATIN SMALL LETTER R +m s LATIN SMALL LETTER S +\' ş LATIN SMALL LETTER S WITH CEDILLA +h t LATIN SMALL LETTER T +a u LATIN SMALL LETTER U +g ü LATIN SMALL LETTER U WITH DIAERESIS +c v LATIN SMALL LETTER V +; y LATIN SMALL LETTER Y +n z LATIN SMALL LETTER Z + +[ q LATIN SMALL LETTER Q +] w LATIN SMALL LETTER W +\\ x LATIN SMALL LETTER X + +§ + PLUS SIGN +- / SOLIDUS += - HYPHEN-MINUS +/ , COMMA +` < LESS-THAN SIGN + +£ # NUMBER SIGN +¶ { LEFT CURLY BRACKET +• [ LEFT SQUARE BRACKET +ª ] RIGHT SQUARE BRACKET +º } RIGHT CURLY BRACKET +– \ REVERSE SOLIDUS +≠ | VERTICAL LINE +œ @ COMMERCIAL AT +‘ ~ TILDE +å û LATIN SMALL LETTER U WITH CIRCUMFLEX +ß î LATIN SMALL LETTER I WITH CIRCUMFLEX +∂ € EURO SIGN +ƒ â LATIN SMALL LETTER A WITH CIRCUMFLEX +˙ ₺ TURKISH LIRA SIGN +¬ £ POUND SIGN +… ¥ YEN SIGN +` « LEFT-POINTING DOUBLE ANGLE QUOTATION MARK diff --git a/runtime/keymap/turkish-q.vim b/runtime/keymap/turkish-q.vim new file mode 100644 index 0000000000..900c10eb92 --- /dev/null +++ b/runtime/keymap/turkish-q.vim @@ -0,0 +1,62 @@ +" Vim keymap file for Turkish Q layout +" Maintainer: Emir SARI <bitigchi@me.com> +" Last changed: 5 August 2020 + +scriptencoding utf-8 +let b:keymap_name = "tr-q" +loadkeymap + +\> Ç LATIN CAPITAL LETTER C WITH CEDILLA +\{ Ğ LATIN CAPITAL LETTER G WITH BREVE +\" İ LATIN CAPITAL LETTER I WITH DOT ABOVE +\< Ö LATIN CAPITAL LETTER O WITH DIAERESIS +\: Ş LATIN CAPITAL LETTER S WITH CEDILLA +\} Ü LATIN CAPITAL LETTER U WITH DIAERESIS + +± é LATIN SMALL LETTER E WITH ACUTE +@ ' APOSTROPHE +# ^ CIRCUMFLEX ACCENT +$ + PLUS SIGN +^ & AMPERSAND +& / SOLIDUS +* ( LEFT PARENTHESIS +( ) RIGHT PARENTHESIS +) = EQUAL SIGN +_ ? QUESTION MARK ++ _ LOW LINE +~ > GREATER-THAN SIGN +| ; SEMICOLON +? : COLON + +\. ç LATIN SMALL LETTER C WITH CEDILLA +\[ ğ LATIN SMALL LETTER G WITH BREVE +\' i LATIN SMALL LETTER I +\, ö LATIN SMALL LETTER O WITH DIAERESIS +\; ş LATIN SMALL LETTER S WITH CEDILLA +\] ü LATIN SMALL LETTER U WITH DIAERESIS +i ı LATIN SMALL LETTER DOTLESS I + +§ " QUOTATION MARK +- * ASTERISK += - HYPHEN-MINUS +\\ , COMMA +\/ . FULL STOP +` < LESS-THAN SIGN + +™ £ POUND SIGN +£ # NUMBER SIGN +¢ $ DOLLAR SIGN +∞ ½ VULGAR FRACTION ONE HALF +¶ { LEFT CURLY BRACKET +• [ LEFT SQUARE BRACKET +ª ] RIGHT SQUARE BRACKET +º } RIGHT CURLY BRACKET +– \ REVERSE SOLIDUS +≠ | VERTICAL LINE +œ @ COMMERCIAL AT +´ € EURO SIGN +† ₺ TURKISH LIRA SIGN +¥ ¥ YEN SIGN +‘ ~ TILDE +… ´ ACUTE ACCENT +« ` GRAVE ACCENT diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim index 73bbd8d03f..f915b4d375 100644 --- a/runtime/syntax/css.vim +++ b/runtime/syntax/css.vim @@ -1,11 +1,12 @@ " Vim syntax file " Language: Cascading Style Sheets " Previous Contributor List: +" Jules Wang <w.jq0722@gmail.com> " Claudio Fleiner <claudio@fleiner.com> (Maintainer) " Yeti (Add full CSS2, HTML4 support) " Nikolai Weibull (Add CSS2 support) -" URL: https://github.com/JulesWang/css.vim -" Maintainer: Jules Wang <w.jq0722@gmail.com> +" URL: https://github.com/jsit/css.vim +" Maintainer: Jay Sitter <jay@jaysitter.com> " Last Change: 2019 Jul. 29 " quit when a syntax file was already loaded @@ -68,7 +69,7 @@ endtry " digits syn match cssValueInteger contained "[-+]\=\d\+" contains=cssUnitDecorators syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\=" contains=cssUnitDecorators -syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|fr\|vw\|vh\|vmin\|vmax\)\>" contains=cssUnitDecorators +syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|fr\|vw\|vh\|vmin\|vmax\|ch\)\>" contains=cssUnitDecorators syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=%" contains=cssUnitDecorators syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)\>" contains=cssUnitDecorators syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)\>" contains=cssUnitDecorators @@ -128,12 +129,14 @@ syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgb\|clip syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgba\|hsl\|hsla\|color-stop\|from\|to\)\s*(" end=")" oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma,cssFunction syn region cssFunction contained matchgroup=cssFunctionName start="\<\(linear-\|radial-\)\=\gradient\s*(" end=")" oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunction,cssGradientAttr,cssFunctionComma syn region cssFunction contained matchgroup=cssFunctionName start="\<\(matrix\(3d\)\=\|scale\(3d\|X\|Y\|Z\)\=\|translate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|perspective\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(blur\|brightness\|contrast\|drop-shadow\|grayscale\|hue-rotate\|invert\|opacity\|saturate\|sepia\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma syn keyword cssGradientAttr contained top bottom left right cover center middle ellipse at syn match cssFunctionComma contained "," " Common Prop and Attr syn keyword cssCommonAttr contained auto none inherit all default normal syn keyword cssCommonAttr contained top bottom center stretch hidden visible +syn match cssCommonAttr contained "\<\(max-\|min-\|fit-\)content\>" "------------------------------------------------ " CSS Animations " http://www.w3.org/TR/css3-animations/ diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim index e416a9abfc..6b17b5a35e 100644 --- a/runtime/syntax/fstab.vim +++ b/runtime/syntax/fstab.vim @@ -2,8 +2,8 @@ " Language: fstab file " Maintainer: Radu Dineiu <radu.dineiu@gmail.com> " URL: https://raw.github.com/rid9/vim-fstab/master/fstab.vim -" Last Change: 2019 Jun 06 -" Version: 1.3 +" Last Change: 2020 Aug 06 +" Version: 1.4 " " Credits: " David Necas (Yeti) <yeti@physics.muni.cz> @@ -68,7 +68,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-]\+/ syn keyword fsOptionsYesNo yes no syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck syn keyword fsOptionsSize 512 1024 2048 -syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail +syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail failok syn match fsOptionsGeneral /_netdev/ " Options: adfs diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim index a387dd4342..d3d8f4f435 100644 --- a/runtime/syntax/help.vim +++ b/runtime/syntax/help.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Vim help file " Maintainer: Bram Moolenaar (Bram@vim.org) -" Last Change: 2020 Mar 06 +" Last Change: 2020 Jul 28 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") diff --git a/runtime/syntax/pamconf.vim b/runtime/syntax/pamconf.vim index 10d667bdf5..29132848a9 100644 --- a/runtime/syntax/pamconf.vim +++ b/runtime/syntax/pamconf.vim @@ -1,7 +1,8 @@ " Vim syntax file " Language: pam(8) configuration file " Previous Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2011-08-03 +" Latest Revision: 2020/08/04 +" Changes By: Haochen Tong if exists("b:current_syntax") @@ -11,23 +12,32 @@ endif let s:cpo_save = &cpo set cpo&vim -syn match pamconfService '^[[:graph:]]\+' - \ nextgroup=pamconfType, - \ pamconfServiceLineCont skipwhite +let s:has_service_field = exists("b:pamconf_has_service_field") + \ ? b:pamconf_has_service_field + \ : expand('%:t') == 'pam.conf' ? 1 : 0 + +syn match pamconfType '-\?[[:alpha:]]\+' + \ contains=pamconfTypeKeyword + \ nextgroup=pamconfControl, + \ pamconfTypeLineCont skipwhite + +syn keyword pamconfTypeKeyword contained account auth password session + +if s:has_service_field + syn match pamconfService '^[[:graph:]]\+' + \ nextgroup=pamconfType, + \ pamconfServiceLineCont skipwhite + + syn match pamconfServiceLineCont contained '\\$' + \ nextgroup=pamconfType, + \ pamconfServiceLineCont skipwhite skipnl +endif syn keyword pamconfTodo contained TODO FIXME XXX NOTE syn region pamconfComment display oneline start='#' end='$' \ contains=pamconfTodo,@Spell -syn match pamconfServiceLineCont contained '\\$' - \ nextgroup=pamconfType, - \ pamconfServiceLineCont skipwhite skipnl - -syn keyword pamconfType account auth password session - \ nextgroup=pamconfControl, - \ pamconfTypeLineCont skipwhite - syn match pamconfTypeLineCont contained '\\$' \ nextgroup=pamconfControl, \ pamconfTypeLineCont skipwhite skipnl @@ -98,7 +108,8 @@ hi def link pamconfTodo Todo hi def link pamconfComment Comment hi def link pamconfService Statement hi def link pamconfServiceLineCont Special -hi def link pamconfType Type +hi def link pamconfType Special +hi def link pamconfTypeKeyword Type hi def link pamconfTypeLineCont pamconfServiceLineCont hi def link pamconfControl Macro hi def link pamconfControlBegin Delimiter |