mirror of
https://github.com/neovim/neovim.git
synced 2026-04-30 11:14:10 +00:00
vim-patch:03413f4
Updated runtime files.
03413f4416
Ignore changes to
* doc/Makefile, doc/help.txt: Related to Vim's version8 documentation
* doc/gui_x11.txt, doc/todo.txt, doc/vim.1, gvim.desktop, vim.desktop:
Irrelevant to Neovim
* doc/quickref.txt, doc/options.txt: As of yet unported 'emoji'
* doc/tags, syntax/vim.vim: Generated at build time
This commit is contained in:
James McCoy
@@ -1,7 +1,7 @@
|
||||
" Vim syntax file
|
||||
" Language: C
|
||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||
" Last Change: 2016 Feb 08
|
||||
" Last Change: 2016 Apr 10
|
||||
|
||||
" Quit when a (custom) syntax file was already loaded
|
||||
if exists("b:current_syntax")
|
||||
@@ -248,6 +248,10 @@ if !exists("c_no_c99") " ISO C99
|
||||
syn keyword cType _Bool bool _Complex complex _Imaginary imaginary
|
||||
syn keyword cType int8_t int16_t int32_t int64_t
|
||||
syn keyword cType uint8_t uint16_t uint32_t uint64_t
|
||||
if !exists("c_no_bsd")
|
||||
" These are BSD specific.
|
||||
syn keyword cType u_int8_t u_int16_t u_int32_t u_int64_t
|
||||
endif
|
||||
syn keyword cType int_least8_t int_least16_t int_least32_t int_least64_t
|
||||
syn keyword cType uint_least8_t uint_least16_t uint_least32_t uint_least64_t
|
||||
syn keyword cType int_fast8_t int_fast16_t int_fast32_t int_fast64_t
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
" Vim syntax file
|
||||
" Language: mysql
|
||||
" Maintainer: Kenneth J. Pronovici <pronovic@ieee.org>
|
||||
" Last Change: $LastChangedDate: 2010-04-22 09:48:02 -0500 (Thu, 22 Apr 2010) $
|
||||
" Last Change: $LastChangedDate: 2016-04-11 10:31:04 -0500 (Mon, 11 Apr 2016) $
|
||||
" Filenames: *.mysql
|
||||
" URL: ftp://cedar-solutions.com/software/mysql.vim
|
||||
" Note: The definitions below are taken from the mysql user manual as of April 2002, for version 3.23
|
||||
@@ -18,7 +18,7 @@ endif
|
||||
syn case ignore
|
||||
|
||||
" General keywords which don't fall into other categories
|
||||
syn keyword mysqlKeyword action add after aggregate all alter as asc auto_increment avg avg_row_length
|
||||
syn keyword mysqlKeyword action add after aggregate all alter as asc auto_increment avg_row_length
|
||||
syn keyword mysqlKeyword both by
|
||||
syn keyword mysqlKeyword cascade change character check checksum column columns comment constraint create cross
|
||||
syn keyword mysqlKeyword current_date current_time current_timestamp
|
||||
@@ -30,7 +30,7 @@ syn keyword mysqlKeyword global grant grants group
|
||||
syn keyword mysqlKeyword having heap high_priority hosts hour hour_minute hour_second
|
||||
syn keyword mysqlKeyword identified ignore index infile inner insert insert_id into isam
|
||||
syn keyword mysqlKeyword join
|
||||
syn keyword mysqlKeyword key keys kill last_insert_id leading left limit lines load local lock logs long
|
||||
syn keyword mysqlKeyword key keys kill last_insert_id leading left limit lines load local lock logs long
|
||||
syn keyword mysqlKeyword low_priority
|
||||
syn keyword mysqlKeyword match max_rows middleint min_rows minute minute_second modify month myisam
|
||||
syn keyword mysqlKeyword natural no
|
||||
@@ -64,6 +64,9 @@ syn match mysqlNumber "\<0x[abcdefABCDEF0-9]*\>"
|
||||
" User variables
|
||||
syn match mysqlVariable "@\a*[A-Za-z0-9]*\([._]*[A-Za-z0-9]\)*"
|
||||
|
||||
" Escaped column names
|
||||
syn match mysqlEscaped "`[^`]*`"
|
||||
|
||||
" Comments (c-style, mysql-style and modified sql-style)
|
||||
syn region mysqlComment start="/\*" end="\*/"
|
||||
syn match mysqlComment "#.*"
|
||||
@@ -84,14 +87,14 @@ syn sync ccomment mysqlComment
|
||||
" The second problem is that some of these keywords are included in
|
||||
" function names. For instance, year() is part of the name of the
|
||||
" dayofyear() function, and the dec keyword (no parenthesis) is part of
|
||||
" the name of the decode() function.
|
||||
" the name of the decode() function.
|
||||
|
||||
syn keyword mysqlType tinyint smallint mediumint int integer bigint
|
||||
syn keyword mysqlType date datetime time bit bool
|
||||
syn keyword mysqlType tinyint smallint mediumint int integer bigint
|
||||
syn keyword mysqlType date datetime time bit bool
|
||||
syn keyword mysqlType tinytext mediumtext longtext text
|
||||
syn keyword mysqlType tinyblob mediumblob longblob blob
|
||||
syn region mysqlType start="float\W" end="."me=s-1
|
||||
syn region mysqlType start="float$" end="."me=s-1
|
||||
syn region mysqlType start="float\W" end="."me=s-1
|
||||
syn region mysqlType start="float$" end="."me=s-1
|
||||
syn region mysqlType start="float(" end=")" contains=mysqlNumber,mysqlVariable
|
||||
syn region mysqlType start="double\W" end="."me=s-1
|
||||
syn region mysqlType start="double$" end="."me=s-1
|
||||
@@ -139,12 +142,12 @@ syn region mysqlFlow start="if(" end=")" contains=ALL
|
||||
"
|
||||
" I'm leery of just defining keywords for functions, since according to the MySQL manual:
|
||||
"
|
||||
" Function names do not clash with table or column names. For example, ABS is a
|
||||
" valid column name. The only restriction is that for a function call, no spaces
|
||||
" are allowed between the function name and the `(' that follows it.
|
||||
" Function names do not clash with table or column names. For example, ABS is a
|
||||
" valid column name. The only restriction is that for a function call, no spaces
|
||||
" are allowed between the function name and the `(' that follows it.
|
||||
"
|
||||
" This means that if I want to highlight function names properly, I have to use a
|
||||
" region to define them, not just a keyword. This will probably cause the syntax file
|
||||
" This means that if I want to highlight function names properly, I have to use a
|
||||
" region to define them, not just a keyword. This will probably cause the syntax file
|
||||
" to load more slowly, but at least it will be 'correct'.
|
||||
|
||||
syn region mysqlFunction start="abs(" end=")" contains=ALL
|
||||
@@ -154,6 +157,7 @@ syn region mysqlFunction start="ascii(" end=")" contains=ALL
|
||||
syn region mysqlFunction start="asin(" end=")" contains=ALL
|
||||
syn region mysqlFunction start="atan(" end=")" contains=ALL
|
||||
syn region mysqlFunction start="atan2(" end=")" contains=ALL
|
||||
syn region mysqlFunction start="avg(" end=")" contains=ALL
|
||||
syn region mysqlFunction start="benchmark(" end=")" contains=ALL
|
||||
syn region mysqlFunction start="bin(" end=")" contains=ALL
|
||||
syn region mysqlFunction start="bit_and(" end=")" contains=ALL
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
" Language: shell (sh) Korn shell (ksh) bash (sh)
|
||||
" Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
|
||||
" Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int>
|
||||
" Last Change: Mar 12, 2016
|
||||
" Version: 146
|
||||
" Last Change: Apr 11, 2016
|
||||
" Version: 147
|
||||
" 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)
|
||||
@@ -539,13 +539,20 @@ endif
|
||||
|
||||
" Synchronization: {{{1
|
||||
" ================
|
||||
if !exists("sh_minlines")
|
||||
let sh_minlines = 200
|
||||
if !exists("g:sh_minlines")
|
||||
let s:sh_minlines = 200
|
||||
else
|
||||
let s:sh_minlines= g:sh_minlines
|
||||
endif
|
||||
if !exists("sh_maxlines")
|
||||
let sh_maxlines = 2 * sh_minlines
|
||||
if !exists("g:sh_maxlines")
|
||||
let s:sh_maxlines = 2*s:sh_minlines
|
||||
if s:sh_maxlines < 25
|
||||
let s:sh_maxlines= 25
|
||||
endif
|
||||
else
|
||||
let s:sh_maxlines= g:sh_maxlines
|
||||
endif
|
||||
exec "syn sync minlines=" . sh_minlines . " maxlines=" . sh_maxlines
|
||||
exec "syn sync minlines=" . s:sh_minlines . " maxlines=" . s:sh_maxlines
|
||||
syn sync match shCaseEsacSync grouphere shCaseEsac "\<case\>"
|
||||
syn sync match shCaseEsacSync groupthere shCaseEsac "\<esac\>"
|
||||
syn sync match shDoSync grouphere shDo "\<do\>"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
" Vim syntax file
|
||||
" Language: TeX
|
||||
" Maintainer: Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
|
||||
" Last Change: Mar 07, 2016
|
||||
" Version: 93
|
||||
" Last Change: Apr 11, 2016
|
||||
" Version: 94
|
||||
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
|
||||
"
|
||||
" Notes: {{{1
|
||||
@@ -83,10 +83,14 @@ else
|
||||
let s:tex_conceal= g:tex_conceal
|
||||
endif
|
||||
if !exists("g:tex_superscripts")
|
||||
let g:tex_superscripts= "[0-9a-zA-W.,:;+-<>/()=]"
|
||||
let s:tex_superscripts= "[0-9a-zA-W.,:;+-<>/()=]"
|
||||
else
|
||||
let s:tex_superscripts= g:tex_superscripts
|
||||
endif
|
||||
if !exists("g:tex_subscripts")
|
||||
let g:tex_subscripts= "[0-9aehijklmnoprstuvx,+-/().]"
|
||||
let s:tex_subscripts= "[0-9aehijklmnoprstuvx,+-/().]"
|
||||
else
|
||||
let s:tex_subscripts= g:tex_subscripts
|
||||
endif
|
||||
|
||||
" Determine whether or not to use "*.sty" mode {{{1
|
||||
@@ -1049,7 +1053,7 @@ if has("conceal") && &enc == 'utf-8'
|
||||
endif
|
||||
" s:SuperSub:
|
||||
fun! s:SuperSub(group,leader,pat,cchar)
|
||||
if a:pat =~# '^\\' || (a:leader == '\^' && a:pat =~# g:tex_superscripts) || (a:leader == '_' && a:pat =~# g:tex_subscripts)
|
||||
if a:pat =~# '^\\' || (a:leader == '\^' && a:pat =~# s:tex_superscripts) || (a:leader == '_' && a:pat =~# s:tex_subscripts)
|
||||
" call Decho("SuperSub: group<".a:group."> leader<".a:leader."> pat<".a:pat."> cchar<".a:cchar.">")
|
||||
exe 'syn match '.a:group." '".a:leader.a:pat."' contained conceal cchar=".a:cchar
|
||||
exe 'syn match '.a:group."s '".a:pat ."' contained conceal cchar=".a:cchar.' nextgroup='.a:group.'s'
|
||||
|
||||
Reference in New Issue
Block a user