Skip to content

Commit

Permalink
Updated runtime files.
Browse files Browse the repository at this point in the history
  • Loading branch information
brammool committed Apr 9, 2016
1 parent a4d13de commit 939a1ab
Show file tree
Hide file tree
Showing 11 changed files with 349 additions and 399 deletions.
2 changes: 2 additions & 0 deletions runtime/compiler/gcc.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
" Compiler: GNU C Compiler
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2010-10-14
" added line suggested by Anton Lindqvist 2016 Mar 31

if exists("current_compiler")
finish
Expand All @@ -24,6 +25,7 @@ CompilerSet errorformat=
\%f:%l:\ %trror:\ %m,
\%f:%l:\ %tarning:\ %m,
\%f:%l:\ %m,
\%f:\\(%*[^\\)]\\):\ %m,
\\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
\%D%*\\a[%*\\d]:\ Entering\ directory\ [`']%f',
\%X%*\\a[%*\\d]:\ Leaving\ directory\ [`']%f',
Expand Down
12 changes: 6 additions & 6 deletions runtime/indent/html.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
" Header: "{{{
" Maintainer: Bram Moolenaar
" Original Author: Andy Wokula <anwoku@yahoo.de>
" Last Change: 2015 Sep 25
" Last Change: 2016 Mar 30
" Version: 1.0
" Description: HTML indent script with cached state for faster indenting on a
" range of lines.
Expand Down Expand Up @@ -240,13 +240,13 @@ call s:AddITags(s:indent_tags, [
\ 'sup', 'table', 'textarea', 'title', 'tt', 'u', 'ul', 'var', 'th', 'td',
\ 'tr', 'tbody', 'tfoot', 'thead'])

" Tags added 2011 Sep 09 (especially HTML5 tags):
" New HTML5 elements:
call s:AddITags(s:indent_tags, [
\ 'area', 'article', 'aside', 'audio', 'bdi', 'canvas',
\ 'command', 'datalist', 'details', 'embed', 'figure', 'footer',
\ 'header', 'group', 'keygen', 'mark', 'math', 'meter', 'nav', 'output',
\ 'progress', 'ruby', 'section', 'svg', 'texture', 'time', 'video',
\ 'wbr', 'text'])
\ 'command', 'data', 'datalist', 'details', 'embed', 'figcaption',
\ 'figure', 'footer', 'header', 'keygen', 'mark', 'meter', 'nav', 'output',
\ 'progress', 'rp', 'rt', 'ruby', 'section', 'source', 'summary', 'svg',
\ 'time', 'track', 'video', 'wbr'])

" Tags added for web components:
call s:AddITags(s:indent_tags, [
Expand Down
26 changes: 15 additions & 11 deletions runtime/plugin/logiPat.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" LogiPat:
" LogiPat: Boolean logical pattern matcher
" Author: Charles E. Campbell
" Date: Mar 13, 2013
" Version: 3
" Date: Apr 04, 2016
" Version: 4
" Purpose: to do Boolean-logic based regular expression pattern matching
" Copyright: Copyright (C) 1999-2011 Charles E. Campbell {{{1
" Permission is hereby granted to use and distribute this code,
Expand Down Expand Up @@ -36,21 +36,22 @@

" ---------------------------------------------------------------------
" Load Once: {{{1
if &cp || exists("loaded_logipat")
if &cp || exists("loaded_logiPat")
finish
endif
let g:loaded_LogiPat = "v3"
let g:loaded_logiPat = "v4"
let s:keepcpo = &cpo
set cpo&vim
"DechoRemOn

" ---------------------------------------------------------------------
" Public Interface: {{{1
com! -nargs=* LogiPat call LogiPat(<q-args>,1)
silent! com -nargs=* LP call LogiPat(<q-args>,1)
com! -nargs=+ ELP echomsg LogiPat(<q-args>)
com! -nargs=+ LogiPatFlags let s:LogiPatFlags="<args>"
silent! com -nargs=+ LPF let s:LogiPatFlags="<args>"
com! -nargs=* LogiPat call LogiPat(<q-args>,1)
sil! com -nargs=* LP call LogiPat(<q-args>,1)
sil! com -nargs=* LPR call LogiPat(<q-args>,1,"r")
com! -nargs=+ LPE echomsg LogiPat(<q-args>)
com! -nargs=+ LogiPatFlags let s:LogiPatFlags="<args>"
sil! com -nargs=+ LPF let s:LogiPatFlags="<args>"

" =====================================================================
" Functions: {{{1
Expand All @@ -66,6 +67,9 @@ fun! LogiPat(pat,...)
else
let dosearch= 0
endif
if a:0 >= 3
let s:LogiPatFlags= a:3
endif

let s:npatstack = 0
let s:nopstack = 0
Expand Down Expand Up @@ -126,7 +130,7 @@ fun! LogiPat(pat,...)

" perform the indicated search
if dosearch
if exists("s:LogiPatFlags")
if exists("s:LogiPatFlags") && s:LogiPatFlags != ""
" call Decho("search(result<".result."> LogiPatFlags<".s:LogiPatFlags.">)")
call search(result,s:LogiPatFlags)
else
Expand Down
4 changes: 3 additions & 1 deletion runtime/syntax/c.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2016 Feb 08
" Last Change: 2016 Apr 07

" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
Expand Down Expand Up @@ -248,6 +248,8 @@ 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
" These are BSD specific?
syn keyword cType u_int8_t u_int16_t u_int32_t u_int64_t
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
Expand Down
7 changes: 4 additions & 3 deletions runtime/syntax/desktop.vim
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
" according to freedesktop.org specification 0.9.4
" http://pdx.freedesktop.org/Standards/desktop-entry-spec/desktop-entry-spec-0.9.4.html
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
" Last Change: 2004 May 16
" Last Change: 2016 Apr 02
" (added "Keywords")
" Version Info: desktop.vim 0.9.4-1.2

" For version 5.x: Clear all syntax items
Expand Down Expand Up @@ -53,8 +54,8 @@ syn keyword dtBooleanKey StartupNotify ReadOnly Terminal Hidden NoDisplay nextgr
syn keyword dtBooleanValue true false containedin=dtBoolean contained

" String
syn match dtString /^\s*\<\(Encoding\|Icon\|Path\|Actions\|FSType\|MountPoint\|UnmountIcon\|URL\|Categories\|OnlyShowIn\|NotShowIn\|StartupWMClass\|FilePattern\|MimeType\)\>.*/ contains=dtStringKey,dtDelim transparent
syn keyword dtStringKey Type Encoding TryExec Exec Path Actions FSType MountPoint URL Categories OnlyShowIn NotShowIn StartupWMClass FilePattern MimeType nextgroup=dtDelim containedin=dtString contained
syn match dtString /^\s*\<\(Encoding\|Icon\|Path\|Actions\|FSType\|MountPoint\|UnmountIcon\|URL\|Keywords\|Categories\|OnlyShowIn\|NotShowIn\|StartupWMClass\|FilePattern\|MimeType\)\>.*/ contains=dtStringKey,dtDelim transparent
syn keyword dtStringKey Type Encoding TryExec Exec Path Actions FSType MountPoint URL Keywords Categories OnlyShowIn NotShowIn StartupWMClass FilePattern MimeType nextgroup=dtDelim containedin=dtString contained

" Exec
syn match dtExec /^\s*\<\(Exec\|TryExec\|SwallowExec\)\>.*/ contains=dtExecKey,dtDelim,dtExecParam transparent
Expand Down
8 changes: 6 additions & 2 deletions runtime/syntax/diff.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
" Language: Diff (context or unified)
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Translations by Jakson Alves de Aquino.
" Last Change: 2015 Feb 03
" Last Change: 2016 Apr 02

" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
Expand Down Expand Up @@ -342,7 +342,7 @@ syn match diffLine "^\<\d\+\>.*"
syn match diffLine "^\*\*\*\*.*"
syn match diffLine "^---$"

"Some versions of diff have lines like "#c#" and "#d#" (where # is a number)
" Some versions of diff have lines like "#c#" and "#d#" (where # is a number)
syn match diffLine "^\d\+\(,\d\+\)\=[cda]\d\+\>.*"

syn match diffFile "^diff\>.*"
Expand All @@ -352,12 +352,16 @@ syn match diffFile "^==== .*"
syn match diffOldFile "^\*\*\* .*"
syn match diffNewFile "^--- .*"

" Used by git
syn match diffIndexLine "^index \x\x\x\x.*"

syn match diffComment "^#.*"

" Define the default highlighting.
" Only used when an item doesn't have highlighting yet
hi def link diffOldFile diffFile
hi def link diffNewFile diffFile
hi def link diffIndexLine PreProc
hi def link diffFile Type
hi def link diffOnly Constant
hi def link diffIdentical Constant
Expand Down
3 changes: 2 additions & 1 deletion runtime/syntax/help.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Vim help file
" Maintainer: Bram Moolenaar (Bram@vim.org)
" Last Change: 2014 Feb 12
" Last Change: 2016 Apr 01

" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
Expand Down Expand Up @@ -45,6 +45,7 @@ syn match helpVim "VIM REFERENCE.*"
syn match helpOption "'[a-z]\{2,\}'"
syn match helpOption "'t_..'"
syn match helpCommand "`[^` \t]\+`"hs=s+1,he=e-1 contains=helpBacktick
syn match helpCommand "\(^\|[^a-z"[]\)\zs`[^`]\+`\ze\([^a-z\t."']\|$\)"hs=s+1,he=e-1 contains=helpBacktick
syn match helpHeader "\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore
syn match helpGraphic ".* \ze`$" nextgroup=helpIgnore
if has("conceal")
Expand Down
7 changes: 4 additions & 3 deletions runtime/syntax/sshconfig.vim
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
" Maintainer: Dominik Fischer <d dot f dot fischer at web dot de>
" Contributor: Leonard Ehrenfried <leonard.ehrenfried@web.de>
" Contributor: Karsten Hopp <karsten@redhat.com>
" Last Change: 2016 Mar 1
" SSH Version: 7.2
" Last Change: 2016 Apr 7
" SSH Version: 7.2p2
"

" Setup
Expand Down Expand Up @@ -36,7 +36,7 @@ syn keyword sshconfigTodo TODO FIXME NOTE contained


" Constants
syn keyword sshconfigYesNo yes no ask
syn keyword sshconfigYesNo yes no ask confirm
syn keyword sshconfigYesNo any auto
syn keyword sshconfigYesNo force autoask none

Expand Down Expand Up @@ -139,6 +139,7 @@ syn keyword sshconfigHostSect Host
syn keyword sshconfigMatch canonical exec host originalhost user localuser all

syn keyword sshconfigKeyword AddressFamily
syn keyword sshconfigKeyword AddKeysToAgent
syn keyword sshconfigKeyword BatchMode
syn keyword sshconfigKeyword BindAddress
syn keyword sshconfigKeyword CanonicalDomains
Expand Down
Loading

0 comments on commit 939a1ab

Please sign in to comment.