diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-24 18:13:46 -0400 |
---|---|---|
committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-27 09:21:30 -0400 |
commit | b918d99a61a472727de25861643c0d79fa57730a (patch) | |
tree | 5963814fb1cdc5b15210637b969b130e24b6e5de | |
parent | 348f72524dc205baffa994e498a033b66a082ce0 (diff) | |
download | rneovim-b918d99a61a472727de25861643c0d79fa57730a.tar.gz rneovim-b918d99a61a472727de25861643c0d79fa57730a.tar.bz2 rneovim-b918d99a61a472727de25861643c0d79fa57730a.zip |
vim-patch:91359014b359
Update runtime files.
https://github.com/vim/vim/commit/91359014b359cf816bf943fe2c7d492996263def
-rw-r--r-- | runtime/doc/if_pyth.txt | 27 | ||||
-rw-r--r-- | runtime/doc/syntax.txt | 10 | ||||
-rw-r--r-- | runtime/pack/dist/opt/termdebug/plugin/termdebug.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/c.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/tmux.vim | 50 |
5 files changed, 55 insertions, 40 deletions
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index ed3bdcf277..d855f33376 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -586,17 +586,28 @@ functions to evaluate Python expressions and pass their values to Vim script. Python 3 *python3* *:py3* *:python3* -The `:py3` and `:python3` commands work similar to `:python`. A simple check -if the `:py3` command is working: > - :py3 print("Hello") +:[range]py3 {stmt} +:[range]py3 << [endmarker] +{script} +{endmarker} -To see what version of Python you have: > - :py3 import sys - :py3 print(sys.version) +:[range]python3 {stmt} +:[range]python3 << [endmarker] +{script} +{endmarker} + The `:py3` and `:python3` commands work similar to `:python`. A + simple check if the `:py3` command is working: > + :py3 print("Hello") +< + To see what version of Python you have: > + :py3 import sys + :py3 print(sys.version) < *:py3file* -The `:py3file` command works similar to `:pyfile`. +:[range]py3f[ile] {file} + The `:py3file` command works similar to `:pyfile`. *:py3do* -The `:py3do` command works similar to `:pydo`. +:[range]py3do {body} + The `:py3do` command works similar to `:pydo`. *E880* Raising SystemExit exception in python isn't endorsed way to quit vim, use: > diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 1e938fc8a0..ed4b5eb659 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -943,10 +943,12 @@ Basic. C *c.vim* *ft-c-syntax* A few things in C highlighting are optional. To enable them assign any value -to the respective variable. Example: > +(including zero) to the respective variable. Example: > :let c_comment_strings = 1 -To disable them use ":unlet". Example: > + :let c_no_bracket_error = 0 +To disable them use `:unlet`. Example: > :unlet c_comment_strings +Setting the value to zero doesn't work! An alternative is to switch to the C++ highlighting: > :set filetype=cpp @@ -962,8 +964,8 @@ Variable Highlight ~ except { and } in first column Default is to highlight them, otherwise you can't spot a missing ")". -*c_curly_error* highlight a missing }; this forces syncing from the - start of the file, can be slow +*c_curly_error* highlight a missing } by finding all pairs; this + forces syncing from the start of the file, can be slow *c_no_ansi* don't do standard ANSI types and constants *c_ansi_typedefs* ... but do standard ANSI types *c_ansi_constants* ... but do standard ANSI constants diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim index be5d4b345e..1f5e6682e7 100644 --- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim +++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim @@ -292,7 +292,7 @@ func s:StartDebug_term(dict) sleep 10m endwhile - " Interpret commands while the target is running. This should usualy only be + " Interpret commands while the target is running. This should usually only be " exec-interrupt, since many commands don't work properly while the target is " running. call s:SendCommand('-gdb-set mi-async on') @@ -348,7 +348,7 @@ func s:StartDebug_prompt(dict) return endif - " Interpret commands while the target is running. This should usualy only + " Interpret commands while the target is running. This should usually only " be exec-interrupt, since many commands don't work properly while the " target is running. call s:SendCommand('-gdb-set mi-async on') diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim index 2a14ae0c46..79c12ab713 100644 --- a/runtime/syntax/c.vim +++ b/runtime/syntax/c.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: C " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2019 Apr 23 +" Last Change: 2019 Nov 29 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -137,7 +137,7 @@ if exists("c_no_curly_error") syn match cParenError display ")" syn match cErrInParen display contained "^^<%\|^%>" else - syn region cParen transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,@cStringGroup,@Spell + syn region cParen transparent start='(' end=')' contains=ALLBUT,cBlock,@cParenGroup,cCppParen,@cStringGroup,@Spell " cCppParen: same as cParen but ends at end-of-line; used in cDefine syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell syn match cParenError display ")" diff --git a/runtime/syntax/tmux.vim b/runtime/syntax/tmux.vim index d32016e566..d5419982ad 100644 --- a/runtime/syntax/tmux.vim +++ b/runtime/syntax/tmux.vim @@ -1,5 +1,5 @@ " Language: tmux(1) configuration file -" Version: 2.9a (git-0d64531f) +" Version: 3.0 (git-48cbbb87) " URL: https://github.com/ericpruitt/tmux.vim/ " Maintainer: Eric Pruitt <eric.pruitt@gmail.com> " License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause) @@ -28,6 +28,7 @@ syn match tmuxNumber /\<\d\+\>/ display syn match tmuxFlags /\s-\a\+/ display syn match tmuxVariable /\w\+=/ display syn match tmuxVariableExpansion /\${\=\w\+}\=/ display +syn match tmuxControl /%\(if\|elif\|else\|endif\)/ syn region tmuxComment start=/#/ skip=/\\\@<!\\$/ end=/$/ contains=tmuxTodo @@ -43,6 +44,7 @@ hi def link tmuxFormatString Identifier hi def link tmuxAction Boolean hi def link tmuxBoolean Boolean hi def link tmuxCommands Keyword +hi def link tmuxControl Keyword hi def link tmuxComment Comment hi def link tmuxKey Special hi def link tmuxNumber Number @@ -62,29 +64,29 @@ for s:i in range(0, 255) endfor syn keyword tmuxOptions -\ buffer-limit command-alias default-terminal escape-time exit-empty -\ activity-action assume-paste-time base-index bell-action default-command -\ default-shell default-size destroy-unattached detach-on-destroy -\ display-panes-active-colour display-panes-colour display-panes-time -\ display-time exit-unattached focus-events history-file history-limit -\ key-table lock-after-time lock-command message-command-style message-limit -\ message-style mouse aggressive-resize allow-rename alternate-screen -\ automatic-rename automatic-rename-format clock-mode-colour -\ clock-mode-style main-pane-height main-pane-width mode-keys mode-style -\ monitor-activity monitor-bell monitor-silence other-pane-height -\ other-pane-width pane-active-border-style pane-base-index -\ pane-border-format pane-border-status pane-border-style prefix prefix2 -\ remain-on-exit renumber-windows repeat-time set-clipboard set-titles -\ set-titles-string silence-action status status-bg status-fg status-format -\ status-interval status-justify status-keys status-left status-left-length -\ status-left-style status-position status-right status-right-length -\ status-right-style status-style synchronize-panes terminal-overrides -\ update-environment user-keys visual-activity visual-bell visual-silence -\ window-active-style window-size window-status-activity-style -\ window-status-bell-style window-status-current-format -\ window-status-current-style window-status-format window-status-last-style -\ window-status-separator window-status-style window-style word-separators -\ wrap-search xterm-keys +\ backspace buffer-limit command-alias default-terminal escape-time +\ exit-empty activity-action assume-paste-time base-index bell-action +\ default-command default-shell default-size destroy-unattached +\ detach-on-destroy display-panes-active-colour display-panes-colour +\ display-panes-time display-time exit-unattached focus-events history-file +\ history-limit key-table lock-after-time lock-command message-command-style +\ message-limit message-style aggressive-resize allow-rename +\ alternate-screen automatic-rename automatic-rename-format +\ clock-mode-colour clock-mode-style main-pane-height main-pane-width +\ mode-keys mode-style monitor-activity monitor-bell monitor-silence mouse +\ other-pane-height other-pane-width pane-active-border-style +\ pane-base-index pane-border-format pane-border-status pane-border-style +\ prefix prefix2 remain-on-exit renumber-windows repeat-time set-clipboard +\ set-titles set-titles-string silence-action status status-bg status-fg +\ status-format status-interval status-justify status-keys status-left +\ status-left-length status-left-style status-position status-right +\ status-right-length status-right-style status-style synchronize-panes +\ terminal-overrides update-environment user-keys visual-activity +\ visual-bell visual-silence window-active-style window-size +\ window-status-activity-style window-status-bell-style +\ window-status-current-format window-status-current-style +\ window-status-format window-status-last-style window-status-separator +\ window-status-style window-style word-separators wrap-search xterm-keys syn keyword tmuxCommands \ attach attach-session bind bind-key break-pane breakp capture-pane |