diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-03-21 12:04:06 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-21 12:04:06 -0400 |
commit | 070e084a64dd08ff28c826843f0d61ca51837841 (patch) | |
tree | 34a631b515f553447aa21f0400c8a576bb20dc61 /runtime | |
parent | e5bef5974e900001cb6ed302b39a6f5ddf48d9a4 (diff) | |
parent | c620ca4cc2f5c0b3cebde2e172ed1682b06f4495 (diff) | |
download | rneovim-070e084a64dd08ff28c826843f0d61ca51837841.tar.gz rneovim-070e084a64dd08ff28c826843f0d61ca51837841.tar.bz2 rneovim-070e084a64dd08ff28c826843f0d61ca51837841.zip |
Merge pull request #14172 from janlazo/vim-8.2.2622
vim-patch:8.2.{2622,2624,2625,2626,2631,2634}
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/tagsrch.txt | 14 | ||||
-rw-r--r-- | runtime/filetype.vim | 6 |
2 files changed, 16 insertions, 4 deletions
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index 23db809543..a8848b103e 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -847,19 +847,25 @@ like |CTRL-]|. The function used for generating the taglist is specified by setting the 'tagfunc' option. The function will be called with three arguments: - a:pattern The tag identifier used during the tag search. - a:flags List of flags to control the function behavior. + a:pattern The tag identifier or pattern used during the tag search. + a:flags String containing flags to control the function behavior. a:info Dict containing the following entries: buf_ffname Full filename which can be used for priority. user_data Custom data String, if stored in the tag stack previously by tagfunc. -Currently two flags may be passed to the tag function: +Currently up to three flags may be passed to the tag function: 'c' The function was invoked by a normal command being processed (mnemonic: the tag function may use the context around the cursor to perform a better job of generating the tag list.) 'i' In Insert mode, the user was completing a tag (with - |i_CTRL-X_CTRL-]|). + |i_CTRL-X_CTRL-]| or 'completeopt' contains `t`). + 'r' The first argument to tagfunc should be interpreted as a + |pattern| (see |tag-regexp|), such as when using: > + :tag /pat +< It is also given when completing in insert mode. + If this flag is not present, the argument is usually taken + literally as the full tag name. Note that when 'tagfunc' is set, the priority of the tags described in |tag-priority| does not apply. Instead, the priority is exactly as the diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 4130db2534..36352db533 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -164,6 +164,9 @@ au BufNewFile,BufRead *.mar setf vmasm " Atlas au BufNewFile,BufRead *.atl,*.as setf atlas +" Atom is based on XML +au BufNewFile,BufRead *.atom setf xml + " Autoit v3 au BufNewFile,BufRead *.au3 setf autoit @@ -1397,6 +1400,9 @@ else au BufNewFile,BufRead *.rmd,*.smd setf rmd endif +" RSS looks like XML +au BufNewFile,BufRead *.rss setf xml + " R reStructuredText file if has("fname_case") au BufNewFile,BufRead *.Rrst,*.rrst,*.Srst,*.srst setf rrst |