vim-patch:partial 113cb513f76d (#16260)
Update runtime files
113cb513f7
skip doc/eval.txt
skip doc/insert.txt
skip doc/user_06.txt (needs 8.2.3562)
partial skip doc/syntax.txt (needs 8.2.3562)
This commit is contained in:
Christian Clason
GitHub
parent
16d4af6d2f
commit
8cbe100fcc
File diff suppressed because one or more lines are too long
|
|
@ -4933,7 +4933,7 @@ getcompletion({pat}, {type} [, {filtered}]) *getcompletion()*
|
|||
behave :behave suboptions
|
||||
cmdline |cmdline-completion| result
|
||||
color color schemes
|
||||
command Ex command (and arguments)
|
||||
command Ex command
|
||||
compiler compilers
|
||||
cscope |:cscope| suboptions
|
||||
diff_buffer |:diffget| and |:diffput| completion
|
||||
|
|
@ -6833,6 +6833,7 @@ match({expr}, {pat} [, {start} [, {count}]]) *match()*
|
|||
further down in the text.
|
||||
|
||||
Can also be used as a |method|: >
|
||||
GetText()->match('word')
|
||||
GetList()->match('word')
|
||||
<
|
||||
*matchadd()* *E798* *E799* *E801* *E957*
|
||||
|
|
@ -6992,8 +6993,10 @@ matchlist({expr}, {pat} [, {start} [, {count}]]) *matchlist()*
|
|||
< Results in: ['acd', 'a', '', 'c', 'd', '', '', '', '', '']
|
||||
When there is no match an empty list is returned.
|
||||
|
||||
You can pass in a List, but that is not very useful.
|
||||
|
||||
Can also be used as a |method|: >
|
||||
GetList()->matchlist('word')
|
||||
GetText()->matchlist('word')
|
||||
|
||||
matchstr({expr}, {pat} [, {start} [, {count}]]) *matchstr()*
|
||||
Same as |match()|, but return the matched string. Example: >
|
||||
|
|
|
|||
|
|
@ -604,26 +604,22 @@ CLOJURE *ft-clojure-indent* *clojure-indent*
|
|||
Clojure indentation differs somewhat from traditional Lisps, due in part to
|
||||
the use of square and curly brackets, and otherwise by community convention.
|
||||
These conventions are not universally followed, so the Clojure indent script
|
||||
offers a few configurable options, listed below.
|
||||
offers a few configuration options.
|
||||
|
||||
If the current vim does not include searchpairpos(), the indent script falls
|
||||
back to normal 'lisp' indenting, and the following options are ignored.
|
||||
|
||||
*g:clojure_maxlines*
|
||||
|
||||
Set maximum scan distance of searchpairpos(). Larger values trade performance
|
||||
for correctness when dealing with very long forms. A value of 0 will scan
|
||||
without limits.
|
||||
>
|
||||
" Default
|
||||
let g:clojure_maxlines = 100
|
||||
<
|
||||
Sets maximum scan distance of `searchpairpos()`. Larger values trade
|
||||
performance for correctness when dealing with very long forms. A value of
|
||||
0 will scan without limits. The default is 300.
|
||||
|
||||
|
||||
*g:clojure_fuzzy_indent*
|
||||
*g:clojure_fuzzy_indent_patterns*
|
||||
*g:clojure_fuzzy_indent_blacklist*
|
||||
|
||||
The 'lispwords' option is a list of comma-separated words that mark special
|
||||
forms whose subforms must be indented with two spaces.
|
||||
forms whose subforms should be indented with two spaces.
|
||||
|
||||
For example:
|
||||
>
|
||||
|
|
@ -641,15 +637,11 @@ the fuzzy indent feature:
|
|||
let g:clojure_fuzzy_indent_patterns = ['^with', '^def', '^let']
|
||||
let g:clojure_fuzzy_indent_blacklist =
|
||||
\ ['-fn$', '\v^with-%(meta|out-str|loading-context)$']
|
||||
|
||||
" Legacy comma-delimited string version; the list format above is
|
||||
" recommended. Note that patterns are implicitly anchored with ^ and $
|
||||
let g:clojure_fuzzy_indent_patterns = 'with.*,def.*,let.*'
|
||||
<
|
||||
|g:clojure_fuzzy_indent_patterns| and |g:clojure_fuzzy_indent_blacklist| are
|
||||
|Lists| of patterns that will be matched against the unquoted, unqualified
|
||||
symbol at the head of a list. This means that a pattern like "^foo" will match
|
||||
all these candidates: "foobar", "my.ns/foobar", and "#'foobar".
|
||||
lists of patterns that will be matched against the unqualified symbol at the
|
||||
head of a list. This means that a pattern like `"^foo"` will match all these
|
||||
candidates: `foobar`, `my.ns/foobar`, and `#'foobar`.
|
||||
|
||||
Each candidate word is tested for special treatment in this order:
|
||||
|
||||
|
|
@ -660,20 +652,22 @@ Each candidate word is tested for special treatment in this order:
|
|||
|g:clojure_fuzzy_indent_patterns|
|
||||
4. Return false and indent normally otherwise
|
||||
|
||||
|
||||
*g:clojure_special_indent_words*
|
||||
|
||||
Some forms in Clojure are indented so that every subform is indented only two
|
||||
spaces, regardless of 'lispwords'. If you have a custom construct that should
|
||||
be indented in this idiosyncratic fashion, you can add your symbols to the
|
||||
default list below.
|
||||
Some forms in Clojure are indented such that every subform is indented by only
|
||||
two spaces, regardless of 'lispwords'. If you have a custom construct that
|
||||
should be indented in this idiosyncratic fashion, you can add your symbols to
|
||||
the default list below.
|
||||
>
|
||||
" Default
|
||||
let g:clojure_special_indent_words =
|
||||
\ 'deftype,defrecord,reify,proxy,extend-type,extend-protocol,letfn'
|
||||
<
|
||||
|
||||
*g:clojure_align_multiline_strings*
|
||||
|
||||
Align subsequent lines in multiline strings to the column after the opening
|
||||
Align subsequent lines in multi-line strings to the column after the opening
|
||||
quote, instead of the same column.
|
||||
|
||||
For example:
|
||||
|
|
@ -690,11 +684,7 @@ For example:
|
|||
enim ad minim veniam, quis nostrud exercitation ullamco laboris
|
||||
nisi ut aliquip ex ea commodo consequat.")
|
||||
<
|
||||
This option is off by default.
|
||||
>
|
||||
" Default
|
||||
let g:clojure_align_multiline_strings = 0
|
||||
<
|
||||
|
||||
*g:clojure_align_subforms*
|
||||
|
||||
By default, parenthesized compound forms that look like function calls and
|
||||
|
|
@ -705,18 +695,14 @@ two spaces relative to the opening paren:
|
|||
bar
|
||||
baz)
|
||||
<
|
||||
Setting this option changes this behavior so that all subforms are aligned to
|
||||
the same column, emulating the default behavior of clojure-mode.el:
|
||||
Setting this option to `1` changes this behaviour so that all subforms are
|
||||
aligned to the same column, emulating the default behaviour of
|
||||
clojure-mode.el:
|
||||
>
|
||||
(foo
|
||||
bar
|
||||
baz)
|
||||
<
|
||||
This option is off by default.
|
||||
>
|
||||
" Default
|
||||
let g:clojure_align_subforms = 0
|
||||
<
|
||||
|
||||
FORTRAN *ft-fortran-indent*
|
||||
|
||||
|
|
|
|||
|
|
@ -1115,6 +1115,8 @@ A jump table for the options with a short description can be found at |Q_op|.
|
|||
Also see |win_gettype()|, which returns the type of the window.
|
||||
|
||||
Be careful with changing this option, it can have many side effects!
|
||||
One such effect is that Vim will not check the timestamp of the file,
|
||||
if the file is changed by another program this will not be noticed.
|
||||
|
||||
A "quickfix" buffer is only used for the error list and the location
|
||||
list. This value is set by the |:cwindow| and |:lwindow| commands and
|
||||
|
|
@ -3703,9 +3705,10 @@ A jump table for the options with a short description can be found at |Q_op|.
|
|||
*'list'* *'nolist'*
|
||||
'list' boolean (default off)
|
||||
local to window
|
||||
List mode: Show tabs as CTRL-I is displayed, display $ after end of
|
||||
line. Useful to see the difference between tabs and spaces and for
|
||||
trailing blanks. Further changed by the 'listchars' option.
|
||||
List mode: By default show tabs as CTRL-I is displayed, display $
|
||||
after end of line. Useful to see the difference between tabs and
|
||||
spaces and for trailing blanks. Further changed by the 'listchars'
|
||||
option.
|
||||
|
||||
The cursor is displayed at the start of the space a Tab character
|
||||
occupies, not at the end as usual in Normal mode. To get this cursor
|
||||
|
|
|
|||
|
|
@ -1045,33 +1045,47 @@ This works immediately.
|
|||
|
||||
CLOJURE *ft-clojure-syntax*
|
||||
|
||||
The default syntax groups can be augmented through the
|
||||
*g:clojure_syntax_keywords* and *b:clojure_syntax_keywords* variables. The
|
||||
value should be a |Dictionary| of syntax group names to a |List| of custom
|
||||
identifiers:
|
||||
*g:clojure_syntax_keywords*
|
||||
|
||||
Syntax highlighting of public vars in "clojure.core" is provided by default,
|
||||
but additional symbols can be highlighted by adding them to the
|
||||
|g:clojure_syntax_keywords| variable. The value should be a |Dictionary| of
|
||||
syntax group names, each containing a |List| of identifiers.
|
||||
>
|
||||
let g:clojure_syntax_keywords = {
|
||||
\ 'clojureMacro': ["defproject", "defcustom"],
|
||||
\ 'clojureFunc': ["string/join", "string/replace"]
|
||||
\ 'clojureMacro': ["defproject", "defcustom"],
|
||||
\ 'clojureFunc': ["string/join", "string/replace"]
|
||||
\ }
|
||||
<
|
||||
Refer to the Clojure syntax script for valid syntax group names.
|
||||
|
||||
If the |buffer-variable| *b:clojure_syntax_without_core_keywords* is set, only
|
||||
language constants and special forms are matched.
|
||||
There is also *b:clojure_syntax_keywords* which is a buffer-local variant of
|
||||
this variable intended for use by plugin authors to highlight symbols
|
||||
dynamically.
|
||||
|
||||
Setting *g:clojure_fold* enables folding Clojure code via the syntax engine.
|
||||
Any list, vector, or map that extends over more than one line can be folded
|
||||
using the standard Vim |fold-commands|.
|
||||
By setting the *b:clojure_syntax_without_core_keywords* variable, vars from
|
||||
"clojure.core" will not be highlighted by default. This is useful for
|
||||
namespaces that have set `(:refer-clojure :only [])`
|
||||
|
||||
Please note that this option does not work with scripts that redefine the
|
||||
bracket syntax regions, such as rainbow-parentheses plugins.
|
||||
|
||||
This option is off by default.
|
||||
*g:clojure_fold*
|
||||
|
||||
Setting |g:clojure_fold| to `1` will enable the folding of Clojure code. Any
|
||||
list, vector or map that extends over more than one line can be folded using
|
||||
the standard Vim |fold-commands|.
|
||||
|
||||
|
||||
*g:clojure_discard_macro*
|
||||
|
||||
Set this variable to `1` to enable basic highlighting of Clojure's "discard
|
||||
reader macro".
|
||||
>
|
||||
" Default
|
||||
let g:clojure_fold = 0
|
||||
#_(defn foo [x]
|
||||
(println x))
|
||||
<
|
||||
Note that this option will not correctly highlight stacked discard macros
|
||||
(e.g. `#_#_`).
|
||||
|
||||
|
||||
COBOL *cobol.vim* *ft-cobol-syntax*
|
||||
|
||||
|
|
@ -4768,7 +4782,7 @@ in their own color.
|
|||
Doesn't work recursively, thus you can't use
|
||||
":colorscheme" in a color scheme script.
|
||||
|
||||
To customize a colorscheme use another name, e.g.
|
||||
To customize a color scheme use another name, e.g.
|
||||
"~/.config/nvim/colors/mine.vim", and use `:runtime` to
|
||||
load the original colorscheme: >
|
||||
runtime colors/evening.vim
|
||||
|
|
|
|||
|
|
@ -464,6 +464,7 @@ the current window, try this custom `:HelpCurwin` command:
|
|||
endif
|
||||
if !empty(getcompletion(a:subject, 'help'))
|
||||
execute mods .. ' edit ' .. &helpfile
|
||||
set buftype=help
|
||||
endif
|
||||
return 'help ' .. a:subject
|
||||
endfunction
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
" Vim filetype plugin file
|
||||
" Language: Clojure
|
||||
" Maintainer: Alex Vear <av@axvr.io>
|
||||
" Maintainer: Alex Vear <alex@vear.uk>
|
||||
" Former Maintainers: Sung Pae <self@sungpae.com>
|
||||
" Meikel Brandmeyer <mb@kotka.de>
|
||||
" URL: https://github.com/clojure-vim/clojure.vim
|
||||
" License: Vim (see :h license)
|
||||
" Last Change: 2021-02-13
|
||||
" Last Change: 2021-10-26
|
||||
|
||||
if exists("b:did_ftplugin")
|
||||
finish
|
||||
|
|
@ -17,7 +17,7 @@ set cpo&vim
|
|||
|
||||
let b:undo_ftplugin = 'setlocal iskeyword< define< formatoptions< comments< commentstring< lispwords<'
|
||||
|
||||
setlocal iskeyword+=?,-,*,!,+,/,=,<,>,.,:,$
|
||||
setlocal iskeyword+=?,-,*,!,+,/,=,<,>,.,:,$,%,&,\|
|
||||
|
||||
" There will be false positives, but this is better than missing the whole set
|
||||
" of user-defined def* definitions.
|
||||
|
|
@ -43,7 +43,7 @@ setlocal commentstring=;\ %s
|
|||
" specially and hence are not indented specially.
|
||||
"
|
||||
" -*- LISPWORDS -*-
|
||||
" Generated from https://github.com/clojure-vim/clojure.vim/blob/f8594e7030cdfb0b7990ac92953c77a08a7220f0/clj/src/vim_clojure_static/generate.clj
|
||||
" Generated from https://github.com/clojure-vim/clojure.vim/blob/62b215f079ce0f3834fd295c7a7f6bd8cc54bcc3/clj/src/vim_clojure_static/generate.clj
|
||||
setlocal lispwords=as->,binding,bound-fn,case,catch,cond->,cond->>,condp,def,definline,definterface,defmacro,defmethod,defmulti,defn,defn-,defonce,defprotocol,defrecord,defstruct,deftest,deftest-,deftype,doseq,dotimes,doto,extend,extend-protocol,extend-type,fn,for,if,if-let,if-not,if-some,let,letfn,locking,loop,ns,proxy,reify,set-test,testing,when,when-first,when-let,when-not,when-some,while,with-bindings,with-in-str,with-local-vars,with-open,with-precision,with-redefs,with-redefs-fn,with-test
|
||||
|
||||
" Provide insert mode completions for special forms and clojure.core. As
|
||||
|
|
@ -64,8 +64,8 @@ if exists('loaded_matchit')
|
|||
let b:undo_ftplugin .= ' | unlet! b:match_words b:match_skip'
|
||||
endif
|
||||
|
||||
" Win32 can filter files in the browse dialog
|
||||
if has("gui_win32") && !exists("b:browsefilter")
|
||||
" Filter files in the browse dialog
|
||||
if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
|
||||
let b:browsefilter = "Clojure Source Files (*.clj)\t*.clj\n" .
|
||||
\ "ClojureScript Source Files (*.cljs)\t*.cljs\n" .
|
||||
\ "Java Source Files (*.java)\t*.java\n" .
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
" Vim filetype plugin file
|
||||
" Language: Mail
|
||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||
" Last Change: 2012 Nov 20
|
||||
" Last Change: 2021 Oct 23
|
||||
|
||||
" Only do this when not done yet for this buffer
|
||||
if exists("b:did_ftplugin")
|
||||
|
|
@ -26,6 +26,14 @@ setlocal fo+=tcql
|
|||
" Add n:> to 'comments, in case it was removed elsewhere
|
||||
setlocal comments+=n:>
|
||||
|
||||
" .eml files are universally formatted with DOS line-endings, per RFC5322.
|
||||
" If the file was not DOS the it will be marked as changed, which is probably
|
||||
" a good thing.
|
||||
if expand('%:e') ==? 'eml'
|
||||
let b:undo_ftplugin ..= " fileformat=" .. &fileformat
|
||||
setlocal fileformat=dos
|
||||
endif
|
||||
|
||||
" Add mappings, unless the user doesn't want this.
|
||||
if !exists("no_plugin_maps") && !exists("no_mail_maps")
|
||||
" Quote text by inserting "> "
|
||||
|
|
|
|||
|
|
@ -12,9 +12,28 @@ set cpo&vim
|
|||
|
||||
setlocal commentstring=#\ %s
|
||||
setlocal comments=:#
|
||||
setlocal formatoptions+=croql formatoptions-=t
|
||||
|
||||
setlocal shiftwidth=2
|
||||
setlocal softtabstop=2
|
||||
let b:undo_ftplugin = "setl com< cms< fo<"
|
||||
|
||||
if get(g:, "meson_recommended_style", 1)
|
||||
setlocal expandtab
|
||||
setlocal shiftwidth=2
|
||||
setlocal softtabstop=2
|
||||
let b:undo_ftplugin .= " | setl et< sts< sw<"
|
||||
endif
|
||||
|
||||
if exists("loaded_matchit") && !exists("b:match_words")
|
||||
let b:match_words = '\<if\>:\<elif\>:\<else\>:\<endif\>,' .
|
||||
\ '\<foreach\>:\<break\>:\<continue\>:\<endforeach\>'
|
||||
let b:undo_ftplugin .= " | unlet! b:match_words"
|
||||
endif
|
||||
|
||||
if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
|
||||
let b:browsefilter = "Meson Build Files (meson.build)\tmeson.build\n" .
|
||||
\ "All Files (*.*)\t*.*\n"
|
||||
let b:undo_ftplugin .= " | unlet! b:browsefilter"
|
||||
endif
|
||||
|
||||
let &cpo = s:keepcpo
|
||||
unlet s:keepcpo
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ if !exists("no_plugin_maps") && !exists("no_spec_maps")
|
|||
endif
|
||||
endif
|
||||
|
||||
if !hasmapto("call SpecChangelog(\"\")<CR>")
|
||||
noremap <buffer> <unique> <script> <Plug>SpecChangelog :call SpecChangelog("")<CR>
|
||||
if !hasmapto("call <SID>SpecChangelog(\"\")<CR>")
|
||||
noremap <buffer> <unique> <script> <Plug>SpecChangelog :call <SID>SpecChangelog("")<CR>
|
||||
endif
|
||||
|
||||
if !exists("*s:GetRelVer")
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
" Vim indent file
|
||||
" Language: Clojure
|
||||
" Maintainer: Alex Vear <av@axvr.io>
|
||||
" Maintainer: Alex Vear <alex@vear.uk>
|
||||
" Former Maintainers: Sung Pae <self@sungpae.com>
|
||||
" Meikel Brandmeyer <mb@kotka.de>
|
||||
" URL: https://github.com/clojure-vim/clojure.vim
|
||||
" License: Vim (see :h license)
|
||||
" Last Change: 2021-02-13
|
||||
" Last Change: 2021-10-26
|
||||
|
||||
if exists("b:did_indent")
|
||||
finish
|
||||
|
|
@ -24,7 +24,7 @@ setlocal indentkeys=!,o,O
|
|||
if exists("*searchpairpos")
|
||||
|
||||
if !exists('g:clojure_maxlines')
|
||||
let g:clojure_maxlines = 100
|
||||
let g:clojure_maxlines = 300
|
||||
endif
|
||||
|
||||
if !exists('g:clojure_fuzzy_indent')
|
||||
|
|
@ -71,14 +71,10 @@ if exists("*searchpairpos")
|
|||
return s:current_char() =~# '\v[\(\)\[\]\{\}]' && !s:ignored_region()
|
||||
endfunction
|
||||
|
||||
" Returns 1 if string matches a pattern in 'patterns', which may be a
|
||||
" list of patterns, or a comma-delimited string of implicitly anchored
|
||||
" patterns.
|
||||
" Returns 1 if string matches a pattern in 'patterns', which should be
|
||||
" a list of patterns.
|
||||
function! s:match_one(patterns, string)
|
||||
let list = type(a:patterns) == type([])
|
||||
\ ? a:patterns
|
||||
\ : map(split(a:patterns, ','), '"^" . v:val . "$"')
|
||||
for pat in list
|
||||
for pat in a:patterns
|
||||
if a:string =~# pat | return 1 | endif
|
||||
endfor
|
||||
endfunction
|
||||
|
|
@ -215,9 +211,10 @@ if exists("*searchpairpos")
|
|||
endfunction
|
||||
|
||||
" Check if form is a reader conditional, that is, it is prefixed by #?
|
||||
" or @#?
|
||||
" or #?@
|
||||
function! s:is_reader_conditional_special_case(position)
|
||||
return getline(a:position[0])[a:position[1] - 3 : a:position[1] - 2] == "#?"
|
||||
\|| getline(a:position[0])[a:position[1] - 4 : a:position[1] - 2] == "#?@"
|
||||
endfunction
|
||||
|
||||
" Returns 1 for opening brackets, -1 for _anything else_.
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ setlocal autoindent " indentexpr isn't much help otherwise
|
|||
setlocal indentexpr=GetMesonIndent(v:lnum)
|
||||
setlocal indentkeys+==elif,=else,=endforeach,=endif,0)
|
||||
|
||||
let b:undo_indent = "setl ai< inde< indk< lisp<"
|
||||
|
||||
" Only define the function once.
|
||||
if exists("*GetMesonIndent")
|
||||
finish
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
" Vim indent file
|
||||
" Language: Vim script
|
||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||
" Last Change: 2021 Apr 18
|
||||
" Last Change: 2021 Nov 03
|
||||
|
||||
" Only load this indent file when no other was loaded.
|
||||
if exists("b:did_indent")
|
||||
|
|
@ -107,7 +107,7 @@ function GetVimIndentIntern()
|
|||
if i >= 0
|
||||
let ind += shiftwidth()
|
||||
if strpart(prev_text, i, 1) == '|' && has('syntax_items')
|
||||
\ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$'
|
||||
\ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\|PatSep\)$'
|
||||
let ind -= shiftwidth()
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"
|
||||
" Author: Bram Moolenaar
|
||||
" Copyright: Vim license applies, see ":help license"
|
||||
" Last Change: 2021 Aug 23
|
||||
" Last Change: 2021 Oct 26
|
||||
"
|
||||
" WORK IN PROGRESS - Only the basics work
|
||||
" Note: On MS-Windows you need a recent version of gdb. The one included with
|
||||
|
|
@ -550,7 +550,7 @@ func s:GdbOutCallback(job_id, msgs, event)
|
|||
let index = 0
|
||||
|
||||
for msg in a:msgs
|
||||
if msg =~ '^^error,msg='
|
||||
if msg =~ '^\^error,msg='
|
||||
if exists('s:evalexpr')
|
||||
\ && s:DecodeMessage(msg[11:])
|
||||
\ =~ 'A syntax error in expression, near\|No symbol .* in current context'
|
||||
|
|
@ -746,8 +746,8 @@ func s:HandleDisasmMsg(msg)
|
|||
else
|
||||
let value = substitute(a:msg, '^\~\"[ ]*', '', '')
|
||||
let value = substitute(value, '^=>[ ]*', '', '')
|
||||
let value = substitute(value, '\\n\"
$', '', '')
|
||||
let value = substitute(value, '
', '', '')
|
||||
let value = substitute(value, '\\n\"\r$', '', '')
|
||||
let value = substitute(value, '\r', '', '')
|
||||
let value = substitute(value, '\\t', ' ', 'g')
|
||||
|
||||
if value != '' || !empty(s:asm_lines)
|
||||
|
|
@ -965,8 +965,22 @@ func s:Run(args)
|
|||
endfunc
|
||||
|
||||
func s:SendEval(expr)
|
||||
call s:SendCommand('-data-evaluate-expression "' . a:expr . '"')
|
||||
let s:evalexpr = a:expr
|
||||
" clean up expression that may got in because of range
|
||||
" (newlines and surrounding spaces)
|
||||
let expr = a:expr
|
||||
if &filetype ==# 'cobol'
|
||||
" extra cleanup for COBOL: _every: expression ends with a period,
|
||||
" a trailing comma is ignored as it commonly separates multiple expr.
|
||||
let expr = substitute(expr, '\..*', '', '')
|
||||
let expr = substitute(expr, '[;\n]', ' ', 'g')
|
||||
let expr = substitute(expr, ',*$', '', '')
|
||||
else
|
||||
let expr = substitute(expr, '\n', ' ', 'g')
|
||||
endif
|
||||
let expr = substitute(expr, '^ *\(.*\) *', '\1', '')
|
||||
|
||||
call s:SendCommand('-data-evaluate-expression "' . expr . '"')
|
||||
let s:evalexpr = expr
|
||||
endfunc
|
||||
|
||||
" :Evaluate - evaluate what is under the cursor
|
||||
|
|
@ -1151,7 +1165,8 @@ func s:HandleError(msg)
|
|||
let s:evalFromBalloonExpr = 0
|
||||
return
|
||||
endif
|
||||
echoerr substitute(a:msg, '.*msg="\(.*\)"', '\1', '')
|
||||
let msgVal = substitute(a:msg, '.*msg="\(.*\)"', '\1', '')
|
||||
echoerr substitute(msgVal, '\\"', '"', 'g')
|
||||
endfunc
|
||||
|
||||
func s:GotoSourcewinOrCreateIt()
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
" Syntax highlighting like in the Arduino IDE
|
||||
" Automatically generated by the script available at
|
||||
" https://bitbucket.org/johannes/arduino-vim-syntax
|
||||
" https://github.com/johshoff/arduino-vim-syntax
|
||||
" Using keywords from <arduino>/build/shared/lib/keywords.txt
|
||||
" From version: 1.8.16
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,12 +1,12 @@
|
|||
" Vim syntax file
|
||||
" Language: Russian Vim program help files *.rux
|
||||
" Maintainer: Restorer (restorers@users.sourceforge.net)
|
||||
" Maintainer: Restorer (restorers@users.sourceforge.net DEFUNCT)
|
||||
" Last Change: 04 Aprl 2017
|
||||
"
|
||||
|
||||
" Проверяем язык локали и установки опции 'helplang'
|
||||
" Если не русский, то выходим из скрипта.
|
||||
if ('ru' !~? v:lang || 'russian' !~? v:lang) && 'ru' !~? &helplang
|
||||
if (v:lang !~? 'ru' || v:lang !~? 'russian') && &helplang !~? 'ru'
|
||||
finish
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
" License: VIM License
|
||||
" Maintainer: Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
|
||||
" Liam Beguin <liambeguin@gmail.com>
|
||||
" Last Change: 2019 Oct 18
|
||||
" Last Change: 2021 Aug 16
|
||||
" Credits: Zvezdan Petkovic <zpetkovic@acm.org>
|
||||
" Neil Schemenauer <nas@meson.ca>
|
||||
" Dmitry Vasiliev
|
||||
|
|
@ -56,9 +56,11 @@ syn match mesonEscape "\\$"
|
|||
" Meson only supports integer numbers
|
||||
" http://mesonbuild.com/Syntax.html#numbers
|
||||
syn match mesonNumber "\<\d\+\>"
|
||||
syn match mesonNumber "\<0x\x\+\>"
|
||||
syn match mesonNumber "\<0o\o\+\>"
|
||||
|
||||
" booleans
|
||||
syn keyword mesonConstant false true
|
||||
syn keyword mesonBoolean false true
|
||||
|
||||
" Built-in functions
|
||||
syn keyword mesonBuiltin
|
||||
|
|
@ -97,6 +99,7 @@ syn keyword mesonBuiltin
|
|||
\ install_headers
|
||||
\ install_man
|
||||
\ install_subdir
|
||||
\ install_emptydir
|
||||
\ is_disabler
|
||||
\ is_variable
|
||||
\ jar
|
||||
|
|
@ -118,6 +121,7 @@ syn keyword mesonBuiltin
|
|||
\ summary
|
||||
\ target_machine
|
||||
\ test
|
||||
\ unset_variable
|
||||
\ vcs_tag
|
||||
\ warning
|
||||
\ range
|
||||
|
|
@ -133,15 +137,15 @@ endif
|
|||
" The default highlight links. Can be overridden later.
|
||||
hi def link mesonStatement Statement
|
||||
hi def link mesonConditional Conditional
|
||||
hi def link mesonRepeat Repeat
|
||||
hi def link mesonRepeat Repeat
|
||||
hi def link mesonOperator Operator
|
||||
hi def link mesonComment Comment
|
||||
hi def link mesonTodo Todo
|
||||
hi def link mesonString String
|
||||
hi def link mesonEscape Special
|
||||
hi def link mesonNumber Number
|
||||
hi def link mesonString String
|
||||
hi def link mesonEscape Special
|
||||
hi def link mesonNumber Number
|
||||
hi def link mesonBuiltin Function
|
||||
hi def link mesonConstant Number
|
||||
hi def link mesonBoolean Boolean
|
||||
if exists("meson_space_error_higlight")
|
||||
hi def link mesonSpaceError Error
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
" Language: shell (sh) Korn shell (ksh) bash (sh)
|
||||
" Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
|
||||
" Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int>
|
||||
" Last Change: Feb 18, 2021
|
||||
" Version: 198
|
||||
" Last Change: Oct 26, 2021
|
||||
" Version: 199
|
||||
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
|
||||
" For options and settings, please use: :help ft-sh-syntax
|
||||
" This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) and heredoc fixes from Felipe Contreras
|
||||
|
|
@ -147,7 +147,7 @@ if exists("b:is_kornshell") || exists("b:is_bash")
|
|||
endif
|
||||
syn cluster shCommandSubList contains=shAlias,shArithmetic,shCmdParenRegion,shCommandSub,shComment,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shEcho,shEscape,shExDoubleQuote,shExpr,shExSingleQuote,shHereDoc,shNumber,shOperator,shOption,shPosnParm,shHereString,shRedir,shSingleQuote,shSpecial,shStatement,shSubSh,shTest,shVariable
|
||||
syn cluster shCurlyList contains=shNumber,shComma,shDeref,shDerefSimple,shDerefSpecial
|
||||
" COMBAK: removing shEscape fromshDblQuoteList fails ksh04:43
|
||||
" COMBAK: removing shEscape from shDblQuoteList fails ksh04:43
|
||||
syn cluster shDblQuoteList contains=shArithmetic,shCommandSub,shCommandSubBQ,shDeref,shDerefSimple,shPosnParm,shCtrlSeq,shSpecial,shSpecialDQ
|
||||
syn cluster shDerefList contains=shDeref,shDerefSimple,shDerefVar,shDerefSpecial,shDerefWordError,shDerefPSR,shDerefPPS
|
||||
syn cluster shDerefVarList contains=shDerefOffset,shDerefOp,shDerefVarArray,shDerefOpError
|
||||
|
|
@ -401,7 +401,7 @@ endif
|
|||
syn match shComment "^\s*\zs#.*$" contains=@shCommentGroup
|
||||
syn match shComment "\s\zs#.*$" contains=@shCommentGroup
|
||||
syn match shComment contained "#.*$" contains=@shCommentGroup
|
||||
syn match shQuickComment contained "#.*$"
|
||||
syn match shQuickComment contained "#.*$" contains=@shCommentGroup
|
||||
syn match shBQComment contained "#.\{-}\ze`" contains=@shCommentGroup
|
||||
|
||||
" Here Documents: {{{1
|
||||
|
|
|
|||
|
|
@ -165,7 +165,6 @@ syn keyword vimCommand contained in
|
|||
syn region vimInsert matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=a\%[ppend]$" matchgroup=vimCommand end="^\.$""
|
||||
syn region vimInsert matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=c\%[hange]$" matchgroup=vimCommand end="^\.$""
|
||||
syn region vimInsert matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=i\%[nsert]$" matchgroup=vimCommand end="^\.$""
|
||||
syn region vimInsert matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=starti\%[nsert]$" matchgroup=vimCommand end="^\.$""
|
||||
|
||||
" Behave! {{{2
|
||||
" =======
|
||||
|
|
@ -201,9 +200,9 @@ syn keyword vimAugroupKey contained aug[roup]
|
|||
" Operators: {{{2
|
||||
" =========
|
||||
syn cluster vimOperGroup contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimType,vimRegister,vimContinue,vim9Comment
|
||||
syn match vimOper "\%#=1\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}" skipwhite nextgroup=vimString,vimSpecFile
|
||||
syn match vimOper "\(\<is\|\<isnot\)[?#]\{0,2}\>" skipwhite nextgroup=vimString,vimSpecFile
|
||||
syn match vimOper "||\|&&\|[-+.!]" skipwhite nextgroup=vimString,vimSpecFile
|
||||
syn match vimOper "\%#=1\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\|!\~#\)[?#]\{0,2}" skipwhite nextgroup=vimString,vimSpecFile
|
||||
syn match vimOper "\(\<is\|\<isnot\)[?#]\{0,2}\>" skipwhite nextgroup=vimString,vimSpecFile
|
||||
syn region vimOperParen matchgroup=vimParenSep start="(" end=")" contains=vimoperStar,@vimOperGroup
|
||||
syn region vimOperParen matchgroup=vimSep start="#\={" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar
|
||||
if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
|
||||
|
|
@ -368,7 +367,7 @@ syn match vimSetMod contained "&vim\=\|[!&?<]\|all&"
|
|||
" Let: {{{2
|
||||
" ===
|
||||
syn keyword vimLet let unl[et] skipwhite nextgroup=vimVar,vimFuncVar,vimLetHereDoc
|
||||
VimFoldh syn region vimLetHereDoc matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\>\)\=\s*\z(\L\S*\)' matchgroup=vimLetHereDocStop end='^\s*\z1\s*$' contains=vimComment,vim9Comment
|
||||
VimFoldh syn region vimLetHereDoc matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\>\)\=\s*\z(\L\S*\)' matchgroup=vimLetHereDocStop end='^\s*\z1\s*$'
|
||||
|
||||
" Abbreviations: {{{2
|
||||
" =============
|
||||
|
|
|
|||
|
|
@ -5720,9 +5720,6 @@ msgstr ""
|
|||
"\n"
|
||||
"--- Terminal-taster ---"
|
||||
|
||||
msgid "Cannot open $VIMRUNTIME/rgb.txt"
|
||||
msgstr "Kan ikke åbne $VIMRUNTIME/rgb.txt"
|
||||
|
||||
#, c-format
|
||||
msgid "Kill job in \"%s\"?"
|
||||
msgstr "Dræb job i \"%s\"?"
|
||||
|
|
|
|||
|
|
@ -5793,9 +5793,6 @@ msgstr ""
|
|||
"\n"
|
||||
"--- Eochracha teirminéil ---"
|
||||
|
||||
msgid "Cannot open $VIMRUNTIME/rgb.txt"
|
||||
msgstr "Ní féidir $VIMRUNTIME/rgb.txt a oscailt"
|
||||
|
||||
msgid "new shell started\n"
|
||||
msgstr "tosaíodh blaosc nua\n"
|
||||
|
||||
|
|
|
|||
|
|
@ -5563,9 +5563,6 @@ msgstr ""
|
|||
"\n"
|
||||
"--- Uçbirim düğmeleri ---"
|
||||
|
||||
msgid "Cannot open $VIMRUNTIME/rgb.txt"
|
||||
msgstr "$VIMRUNTIME/rgb.txt açılamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "E181: Invalid attribute: %s"
|
||||
msgstr "E181: Geçersiz öznitelik: %s"
|
||||
|
|
|
|||
Loading…
Reference in New Issue