From 9ec0b7d52ac2e5f0dfacc06b6d19a73d7fa9aede5112e52c77225fbd709620eb Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 12 Mar 2008 18:39:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=24 --- apparmor.vim | 170 ------- changes.vim | 37 -- ppd.vim | 48 -- vim-7.0-apparmor.patch | 15 - vim-7.0-filetype_apparmor.patch | 190 ++++++++ vim-7.0-filetype_ycp.patch | 27 -- vim-7.1-filetype_changes.patch | 56 +++ ..._spec.patch => vim-7.1-filetype_spec.patch | 17 +- vim.changes | 7 + vim.spec | 21 +- ycp.vim | 422 ------------------ 11 files changed, 278 insertions(+), 732 deletions(-) delete mode 100644 apparmor.vim delete mode 100644 changes.vim delete mode 100644 ppd.vim delete mode 100644 vim-7.0-apparmor.patch create mode 100644 vim-7.0-filetype_apparmor.patch delete mode 100644 vim-7.0-filetype_ycp.patch create mode 100644 vim-7.1-filetype_changes.patch rename vim-7.1-syntax_spec.patch => vim-7.1-filetype_spec.patch (76%) delete mode 100644 ycp.vim diff --git a/apparmor.vim b/apparmor.vim deleted file mode 100644 index 4daee3a..0000000 --- a/apparmor.vim +++ /dev/null @@ -1,170 +0,0 @@ -" $Id$ -" -" ---------------------------------------------------------------------- -" Copyright (c) 2005 Novell, Inc. All Rights Reserved. -" Copyright (c) 2006 Christian Boltz. All Rights Reserved. -" -" This program is free software; you can redistribute it and/or -" modify it under the terms of version 2 of the GNU General Public -" License as published by the Free Software Foundation. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program; if not, contact Novell, Inc. -" -" To contact Novell about this file by physical or electronic mail, -" you may find current contact information at www.novell.com. -" -" To contact Christian Boltz about this file by physical or electronic -" mail, you may find current contact information at www.cboltz.de. -" ---------------------------------------------------------------------- -" -" stick this file into ~/.vim/syntax/ and add these commands into your .vimrc -" to have vim automagically use this syntax file for these directories: -" -" autocmd BufNewFile,BufRead /etc/apparmor.d/* set syntax=apparmor -" autocmd BufNewFile,BufRead /etc/apparmor/profiles/* set syntax=apparmor - - -" color setup... - -" adjust colors according to the background - -" switching colors depending on the background color doesn't work -" unfortunately, so we use colors that work with light and dark background. -" Patches welcome ;-) - -"if &background == "light" -" light background - hi sdProfileName ctermfg=lightblue - hi sdHatName ctermfg=darkblue - hi sdGlob ctermfg=darkmagenta - hi sdEntryWriteExec ctermfg=black ctermbg=yellow - hi sdEntryUX ctermfg=darkred cterm=underline - hi sdEntryCUX ctermfg=darkred - hi sdEntryIX ctermfg=darkcyan - hi sdEntryM ctermfg=darkcyan - hi sdEntryPX ctermfg=darkgreen cterm=underline - hi sdEntryCPX ctermfg=darkgreen - hi sdEntryW ctermfg=darkyellow - hi sdCap ctermfg=lightblue - hi sdNetwork ctermfg=lightblue - hi sdNetworkDanger ctermfg=darkred - hi sdCapKey cterm=underline ctermfg=lightblue - hi sdCapDanger ctermfg=darkred - hi def link sdEntryR Normal - hi def link sdEntryK Normal - hi def link sdFlags Normal - hi sdEntryChangeProfile ctermfg=darkgreen cterm=underline -"else -" dark background -" hi sdProfileName ctermfg=white -" hi sdHatName ctermfg=white -" hi sdGlob ctermfg=magenta -" hi sdEntryWriteExec ctermfg=black ctermbg=yellow -" hi sdEntryUX ctermfg=red cterm=underline -" hi sdEntryCUX ctermfg=red -" hi sdEntryIX ctermfg=cyan -" hi sdEntryM ctermfg=cyan -" hi sdEntryPX ctermfg=green cterm=underline -" hi sdEntryCPX ctermfg=green -" hi sdEntryW ctermfg=yellow -" hi sdCap ctermfg=lightblue -" hi sdCapKey cterm=underline ctermfg=lightblue -" hi def link sdEntryR Normal -" hi def link sdFlags Normal -" hi sdCapDanger ctermfg=red -"endif - -hi def link sdInclude Include -high def link sdComment Comment -high def link sdFlagKey TODO -high def link sdError ErrorMsg - - -" always sync from the start. should be relatively quick since we don't have -" that many rules and profiles shouldn't be _extremely_ large... - syn sync fromstart - -syn keyword sdFlagKey complain audit debug - -" highlight some invalid syntax -"syn match sdError /\v.+$/ " causes false positives on '}' :-( -syn match sdError /{/ contained -syn match sdError /}/ -syn match sdError /^.*$/ "highlight all non-valid lines as error - -syn match sdGlob /\v\?|\*|\{.*,.*\}|[[^\]]\+\]|\@\{[a-zA-Z]*\}/ - -syn cluster sdEntry contains=sdEntryWriteExec,sdEntryR,sdEntryW,sdEntryIX,sdEntryPX,sdEntryCPX,sdEntryUX,sdEntryCUX,sdEntryM,sdCap - - -" Capability line -syn keyword sdCapKey chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease -syn keyword sdCapDanger sys_admin - -syn match sdCap /\v^\s*capability\s+\S+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdCapKey,sdCapDanger nextgroup=@sdEntry,sdComment,sdError,sdInclude - -" Network line -" Syntax: network domain (inet, ...) type (stream, ...) protocol (tcp, ...) -syn keyword sdNetworkDanger raw -syn match sdNetwork /\v^\s*network(\s+(inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|packet|ash|econet|atmsvc|sna|irda|pppox|wanpipe|bluetooth))?(\s+(stream|dgram|seqpacket|raw|rdm|packet))?(\s+(tcp|udp|icmp))?,(\s*$|(\s*#.*$)\@=)/ contains=sdNetworkDanger nextgroup=@sdEntry,sdComment,sdError,sdInclude -"syn match sdNetworkDanger /\v^\s*network(\s+(inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|packet|ash|econet|atmsvc|sna|irda|pppox|wanpipe|bluetooth))?(\s+(raw))?(\s+(tcp|udp|icmp))?,(\s*$|(\s*#.*$)\@=)/ - -syn match sdEntryChangeProfile /\v^\s*change_profile\s+(\/|\@\{\S*\})\S*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude - -" file permissions -" -" write + exec/mmap - danger! -" known bug: accepts 'aw' to keep things simple -syn match sdEntryWriteExec /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w|a|m|k|[iuUpP]x)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude - -" ux(mr) - unconstrained entry, flag the line red -syn match sdEntryUX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|ux)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude -" Ux(mr) - like ux + clean environment -syn match sdEntryCUX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|Ux)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude -" px(mr) - standard exec entry, flag the line blue -syn match sdEntryPX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|px)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude -" Px(mr) - like px + clean environment -syn match sdEntryCPX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|Px)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude -" ix(mr) - standard exec entry, flag the line green -syn match sdEntryIX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|ix)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude -" mr - mmap with PROT_EXEC -syn match sdEntryM /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude - -" if we've got u or i without x, it's an error -syn match sdError /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w|k|u|p|i)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude - -" write + append is an error also -syn match sdError /\v^\s*(\/|\@\{\S*\})\S*\s+([lrkupi]*w[lrkupi]*a[lrkupi]*|[lrkupi]*a[lrkupi]*w[lrkupi]*)\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude - -" write entry, flag the line yellow -syn match sdEntryW /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w|k)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude -" append entry, flag the line yellow -syn match sdEntryW /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|k|a)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude - -" read entry + locking, currently no highlighting -syn match sdEntryK /\v^\s*(\/|\@\{\S*\})\S*\s+[rlk]+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError -" read entry, no highlighting -syn match sdEntryR /\v^\s*(\/|\@\{\S*\})\S*\s+[rl]+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError - -syn match sdProfileName /\v^\/\S+\s+(flags\=\(\S+\)\s+)=\{/ contains=sdProfileStart,sdHatName,sdFlags -syn match sdProfileStart /{/ contained -syn match sdProfileEnd /}/ " contained -syn match sdHatName /\v^\s+\^\S+\s+(flags\=\(\S+\)\s+)=\{/ contains=sdProfileStart,sdFlags -syn match sdHatStart /{/ contained -syn match sdHatEnd /}/ contained -syn match sdFlags /\vflags\=\(\S+\)/ contained contains=sdFlagKey - -syn match sdComment /\s*#.*$/ -syn match sdInclude /\s*#include.*$/ - -" basic profile block... -" \s+ does not work in end=, therefore using \s\s* -syn region Normal start=/\v^\s*\^\S+\s+(flags\=\(\S+\)\s+)=\{/ matchgroup=sdProfileEnd end=/^}\s*$/ contains=sdProfileName,Hat,@sdEntry,sdComment,sdError,sdInclude -syn region Hat start=/\v^\s+\^\S+\s+(flags\=\(\S+\)\s+)=\{/ matchgroup=sdHatEnd end=/^\s\s*}\s*$/ contained contains=sdHatName,@sdEntry,sdComment,sdError,sdInclude - diff --git a/changes.vim b/changes.vim deleted file mode 100644 index ae9e81d..0000000 --- a/changes.vim +++ /dev/null @@ -1,37 +0,0 @@ -" Vim syntax file -" Filename: changes.vim -" Language: SuSE package changes -" Maintainer: Michal Svec -" Last change: 20.8.2003 - -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -" Keywords -syn keyword ChangesArch i386 i486 i586 i686 athlon ia64 xa86_64 -syn keyword ChangesArch I386 I486 I586 I686 ATHLON IA64 XA86_64 -syn keyword ChangesArch ppc axp mips armv4l s390 s390x S/390 s/390 -syn keyword ChangesArch PPC AXP MIPS ARMV4L S390 S390x S390X -syn keyword sparc sparc64 Sparc Sparc64 SPARC SPARC64 noarch NOARCH - -" Highlights -syn match ChangesDate "^[A-Z][a-z][a-z] [A-Z][a-z][a-z] [ 0-9][0-9] [0-9:]\{8\} [A-Z]\+ [0-9]\+" -syn match ChangesDate "^[A-Z][a-z][a-z] [A-Z][a-z][a-z] [ 0-9][0-9] [0-9:]\{8\} [0-9]\+" -syn match ChangesMail " - \<[a-zA-Z\.]\+@[a-zA-Z\.]\+\>$" -syn match ChangesMailText "\<[a-zA-Z\.]\+@[a-zA-Z\.]\+\>" -syn match ChangesSeparator "^-\{40,78\}$" -syn match ChangesBug "#[0-9]\+\>" - -" Colors -hi ChangesArch ctermfg=blue ctermbg=NONE -hi ChangesDate ctermfg=darkgreen ctermbg=NONE -hi ChangesMail ctermfg=darkred ctermbg=NONE -hi ChangesMailText ctermfg=darkred ctermbg=NONE -hi ChangesSeparator ctermfg=darkgreen ctermbg=NONE -hi ChangesBug ctermfg=red ctermbg=NONE - -" Syntax name -let b:current_syntax = "changes" diff --git a/ppd.vim b/ppd.vim deleted file mode 100644 index ff053d6..0000000 --- a/ppd.vim +++ /dev/null @@ -1,48 +0,0 @@ -" Vim syntax file -" Language: PPD (PostScript printer description) file -" Maintainer: Bjoern Jacke -" Last Change: 2001-10-06 - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - - -syn match ppdComment "^\*%.*" -syn match ppdDef "\*[a-zA-Z0-9]\+" -syn match ppdDefine "\*[a-zA-Z0-9\-_]\+:" -syn match ppdUI "\*[a-zA-Z]*\(Open\|Close\)UI" -syn match ppdUIGroup "\*[a-zA-Z]*\(Open\|Close\)Group" -syn match ppdGUIText "/.*:" -syn match ppdContraints "^*UIConstraints:" - -" Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_ahdl_syn_inits") - if version < 508 - let did_ahdl_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - - HiLink ppdComment Comment - HiLink ppdDefine Statement - HiLink ppdUI Function - HiLink ppdUIGroup Function - HiLink ppdDef String - HiLink ppdGUIText Type - HiLink ppdContraints Special - - delcommand HiLink -endif - -let b:current_syntax = "ppd" - -" vim: ts=8 diff --git a/vim-7.0-apparmor.patch b/vim-7.0-apparmor.patch deleted file mode 100644 index a21acde..0000000 --- a/vim-7.0-apparmor.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: vim70/runtime/filetype.vim -=================================================================== ---- vim70.orig/runtime/filetype.vim -+++ vim70/runtime/filetype.vim -@@ -105,6 +105,10 @@ au BufNewFile,BufRead proftpd.conf* cal - au BufNewFile,BufRead .htaccess setf apache - au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache') - -+" AppArmor -+au BufNewFile,BufRead */etc/apparmor.d/* setf apparmor -+au BufNewFile,BufRead */etc/apparmor/profiles/* setf apparmor -+ - " XA65 MOS6510 cross assembler - au BufNewFile,BufRead *.a65 setf a65 - diff --git a/vim-7.0-filetype_apparmor.patch b/vim-7.0-filetype_apparmor.patch new file mode 100644 index 0000000..d18c121 --- /dev/null +++ b/vim-7.0-filetype_apparmor.patch @@ -0,0 +1,190 @@ +Index: vim71/runtime/filetype.vim +=================================================================== +--- vim71.orig/runtime/filetype.vim ++++ vim71/runtime/filetype.vim +@@ -110,6 +110,10 @@ au BufNewFile,BufRead proftpd.conf* cal + au BufNewFile,BufRead .htaccess setf apache + au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache') + ++" AppArmor ++au BufNewFile,BufRead */etc/apparmor.d/* setf apparmor ++au BufNewFile,BufRead */etc/apparmor/profiles/* setf apparmor ++ + " XA65 MOS6510 cross assembler + au BufNewFile,BufRead *.a65 setf a65 + +Index: vim71/runtime/syntax/apparmor.vim +=================================================================== +--- /dev/null ++++ vim71/runtime/syntax/apparmor.vim +@@ -0,0 +1,170 @@ ++" $Id$ ++" ++" ---------------------------------------------------------------------- ++" Copyright (c) 2005 Novell, Inc. All Rights Reserved. ++" Copyright (c) 2006 Christian Boltz. All Rights Reserved. ++" ++" This program is free software; you can redistribute it and/or ++" modify it under the terms of version 2 of the GNU General Public ++" License as published by the Free Software Foundation. ++" ++" This program is distributed in the hope that it will be useful, ++" but WITHOUT ANY WARRANTY; without even the implied warranty of ++" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++" GNU General Public License for more details. ++" ++" You should have received a copy of the GNU General Public License ++" along with this program; if not, contact Novell, Inc. ++" ++" To contact Novell about this file by physical or electronic mail, ++" you may find current contact information at www.novell.com. ++" ++" To contact Christian Boltz about this file by physical or electronic ++" mail, you may find current contact information at www.cboltz.de. ++" ---------------------------------------------------------------------- ++" ++" stick this file into ~/.vim/syntax/ and add these commands into your .vimrc ++" to have vim automagically use this syntax file for these directories: ++" ++" autocmd BufNewFile,BufRead /etc/apparmor.d/* set syntax=apparmor ++" autocmd BufNewFile,BufRead /etc/apparmor/profiles/* set syntax=apparmor ++ ++ ++" color setup... ++ ++" adjust colors according to the background ++ ++" switching colors depending on the background color doesn't work ++" unfortunately, so we use colors that work with light and dark background. ++" Patches welcome ;-) ++ ++"if &background == "light" ++" light background ++ hi sdProfileName ctermfg=lightblue ++ hi sdHatName ctermfg=darkblue ++ hi sdGlob ctermfg=darkmagenta ++ hi sdEntryWriteExec ctermfg=black ctermbg=yellow ++ hi sdEntryUX ctermfg=darkred cterm=underline ++ hi sdEntryCUX ctermfg=darkred ++ hi sdEntryIX ctermfg=darkcyan ++ hi sdEntryM ctermfg=darkcyan ++ hi sdEntryPX ctermfg=darkgreen cterm=underline ++ hi sdEntryCPX ctermfg=darkgreen ++ hi sdEntryW ctermfg=darkyellow ++ hi sdCap ctermfg=lightblue ++ hi sdNetwork ctermfg=lightblue ++ hi sdNetworkDanger ctermfg=darkred ++ hi sdCapKey cterm=underline ctermfg=lightblue ++ hi sdCapDanger ctermfg=darkred ++ hi def link sdEntryR Normal ++ hi def link sdEntryK Normal ++ hi def link sdFlags Normal ++ hi sdEntryChangeProfile ctermfg=darkgreen cterm=underline ++"else ++" dark background ++" hi sdProfileName ctermfg=white ++" hi sdHatName ctermfg=white ++" hi sdGlob ctermfg=magenta ++" hi sdEntryWriteExec ctermfg=black ctermbg=yellow ++" hi sdEntryUX ctermfg=red cterm=underline ++" hi sdEntryCUX ctermfg=red ++" hi sdEntryIX ctermfg=cyan ++" hi sdEntryM ctermfg=cyan ++" hi sdEntryPX ctermfg=green cterm=underline ++" hi sdEntryCPX ctermfg=green ++" hi sdEntryW ctermfg=yellow ++" hi sdCap ctermfg=lightblue ++" hi sdCapKey cterm=underline ctermfg=lightblue ++" hi def link sdEntryR Normal ++" hi def link sdFlags Normal ++" hi sdCapDanger ctermfg=red ++"endif ++ ++hi def link sdInclude Include ++high def link sdComment Comment ++high def link sdFlagKey TODO ++high def link sdError ErrorMsg ++ ++ ++" always sync from the start. should be relatively quick since we don't have ++" that many rules and profiles shouldn't be _extremely_ large... ++ syn sync fromstart ++ ++syn keyword sdFlagKey complain audit debug ++ ++" highlight some invalid syntax ++"syn match sdError /\v.+$/ " causes false positives on '}' :-( ++syn match sdError /{/ contained ++syn match sdError /}/ ++syn match sdError /^.*$/ "highlight all non-valid lines as error ++ ++syn match sdGlob /\v\?|\*|\{.*,.*\}|[[^\]]\+\]|\@\{[a-zA-Z]*\}/ ++ ++syn cluster sdEntry contains=sdEntryWriteExec,sdEntryR,sdEntryW,sdEntryIX,sdEntryPX,sdEntryCPX,sdEntryUX,sdEntryCUX,sdEntryM,sdCap ++ ++ ++" Capability line ++syn keyword sdCapKey chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease ++syn keyword sdCapDanger sys_admin ++ ++syn match sdCap /\v^\s*capability\s+\S+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdCapKey,sdCapDanger nextgroup=@sdEntry,sdComment,sdError,sdInclude ++ ++" Network line ++" Syntax: network domain (inet, ...) type (stream, ...) protocol (tcp, ...) ++syn keyword sdNetworkDanger raw ++syn match sdNetwork /\v^\s*network(\s+(inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|packet|ash|econet|atmsvc|sna|irda|pppox|wanpipe|bluetooth))?(\s+(stream|dgram|seqpacket|raw|rdm|packet))?(\s+(tcp|udp|icmp))?,(\s*$|(\s*#.*$)\@=)/ contains=sdNetworkDanger nextgroup=@sdEntry,sdComment,sdError,sdInclude ++"syn match sdNetworkDanger /\v^\s*network(\s+(inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|packet|ash|econet|atmsvc|sna|irda|pppox|wanpipe|bluetooth))?(\s+(raw))?(\s+(tcp|udp|icmp))?,(\s*$|(\s*#.*$)\@=)/ ++ ++syn match sdEntryChangeProfile /\v^\s*change_profile\s+(\/|\@\{\S*\})\S*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++ ++" file permissions ++" ++" write + exec/mmap - danger! ++" known bug: accepts 'aw' to keep things simple ++syn match sdEntryWriteExec /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w|a|m|k|[iuUpP]x)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++ ++" ux(mr) - unconstrained entry, flag the line red ++syn match sdEntryUX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|ux)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++" Ux(mr) - like ux + clean environment ++syn match sdEntryCUX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|Ux)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++" px(mr) - standard exec entry, flag the line blue ++syn match sdEntryPX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|px)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++" Px(mr) - like px + clean environment ++syn match sdEntryCPX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|Px)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++" ix(mr) - standard exec entry, flag the line green ++syn match sdEntryIX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|ix)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++" mr - mmap with PROT_EXEC ++syn match sdEntryM /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++ ++" if we've got u or i without x, it's an error ++syn match sdError /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w|k|u|p|i)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++ ++" write + append is an error also ++syn match sdError /\v^\s*(\/|\@\{\S*\})\S*\s+([lrkupi]*w[lrkupi]*a[lrkupi]*|[lrkupi]*a[lrkupi]*w[lrkupi]*)\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++ ++" write entry, flag the line yellow ++syn match sdEntryW /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w|k)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++" append entry, flag the line yellow ++syn match sdEntryW /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|k|a)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude ++ ++" read entry + locking, currently no highlighting ++syn match sdEntryK /\v^\s*(\/|\@\{\S*\})\S*\s+[rlk]+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError ++" read entry, no highlighting ++syn match sdEntryR /\v^\s*(\/|\@\{\S*\})\S*\s+[rl]+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError ++ ++syn match sdProfileName /\v^\/\S+\s+(flags\=\(\S+\)\s+)=\{/ contains=sdProfileStart,sdHatName,sdFlags ++syn match sdProfileStart /{/ contained ++syn match sdProfileEnd /}/ " contained ++syn match sdHatName /\v^\s+\^\S+\s+(flags\=\(\S+\)\s+)=\{/ contains=sdProfileStart,sdFlags ++syn match sdHatStart /{/ contained ++syn match sdHatEnd /}/ contained ++syn match sdFlags /\vflags\=\(\S+\)/ contained contains=sdFlagKey ++ ++syn match sdComment /\s*#.*$/ ++syn match sdInclude /\s*#include.*$/ ++ ++" basic profile block... ++" \s+ does not work in end=, therefore using \s\s* ++syn region Normal start=/\v^\s*\^\S+\s+(flags\=\(\S+\)\s+)=\{/ matchgroup=sdProfileEnd end=/^}\s*$/ contains=sdProfileName,Hat,@sdEntry,sdComment,sdError,sdInclude ++syn region Hat start=/\v^\s+\^\S+\s+(flags\=\(\S+\)\s+)=\{/ matchgroup=sdHatEnd end=/^\s\s*}\s*$/ contained contains=sdHatName,@sdEntry,sdComment,sdError,sdInclude ++ diff --git a/vim-7.0-filetype_ycp.patch b/vim-7.0-filetype_ycp.patch deleted file mode 100644 index d552e30..0000000 --- a/vim-7.0-filetype_ycp.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- vim70/runtime/filetype.vim.orig 2006-05-02 20:15:45.000000000 +0200 -+++ vim70/runtime/filetype.vim 2006-07-11 14:36:15.000000000 +0200 -@@ -1640,7 +1640,7 @@ - au BufNewFile,BufRead *.hog,snort.conf,vision.conf,*.rules setf hog - - " Spec (Linux RPM) --au BufNewFile,BufRead *.spec setf spec -+au BufNewFile,BufRead *.spec,*.spec.in setf spec - - " Speedup (AspenTech plant simulator) - au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup -@@ -2019,6 +2019,15 @@ - " zsql (zope sql method) - au BufNewFile,BufRead *.zsql call s:SQL() - -+" YCP -+au BufNewFile,BufRead *.ycp,*.scr,*.yh set ft=ycp -+ -+" changes -+au BufNewFile,BufRead *.changes set ft=changes -+ -+" y2cc -+au BufNewFile,BufRead *.y2cc set ft=dosini -+ - " Z80 assembler asz80 - au BufNewFile,BufRead *.z8a setf z8a - diff --git a/vim-7.1-filetype_changes.patch b/vim-7.1-filetype_changes.patch new file mode 100644 index 0000000..0831bcb --- /dev/null +++ b/vim-7.1-filetype_changes.patch @@ -0,0 +1,56 @@ +Index: vim71/runtime/syntax/changes.vim +=================================================================== +--- /dev/null ++++ vim71/runtime/syntax/changes.vim +@@ -0,0 +1,37 @@ ++" Vim syntax file ++" Filename: changes.vim ++" Language: SuSE package changes ++" Maintainer: Michal Svec ++" Last change: 20.8.2003 ++ ++if version < 600 ++ syntax clear ++elseif exists("b:current_syntax") ++ finish ++endif ++ ++" Keywords ++syn keyword ChangesArch i386 i486 i586 i686 athlon ia64 xa86_64 ++syn keyword ChangesArch I386 I486 I586 I686 ATHLON IA64 XA86_64 ++syn keyword ChangesArch ppc axp mips armv4l s390 s390x S/390 s/390 ++syn keyword ChangesArch PPC AXP MIPS ARMV4L S390 S390x S390X ++syn keyword sparc sparc64 Sparc Sparc64 SPARC SPARC64 noarch NOARCH ++ ++" Highlights ++syn match ChangesDate "^[A-Z][a-z][a-z] [A-Z][a-z][a-z] [ 0-9][0-9] [0-9:]\{8\} [A-Z]\+ [0-9]\+" ++syn match ChangesDate "^[A-Z][a-z][a-z] [A-Z][a-z][a-z] [ 0-9][0-9] [0-9:]\{8\} [0-9]\+" ++syn match ChangesMail " - \<[a-zA-Z\.]\+@[a-zA-Z\.]\+\>$" ++syn match ChangesMailText "\<[a-zA-Z\.]\+@[a-zA-Z\.]\+\>" ++syn match ChangesSeparator "^-\{40,78\}$" ++syn match ChangesBug "#[0-9]\+\>" ++ ++" Colors ++hi ChangesArch ctermfg=blue ctermbg=NONE ++hi ChangesDate ctermfg=darkgreen ctermbg=NONE ++hi ChangesMail ctermfg=darkred ctermbg=NONE ++hi ChangesMailText ctermfg=darkred ctermbg=NONE ++hi ChangesSeparator ctermfg=darkgreen ctermbg=NONE ++hi ChangesBug ctermfg=red ctermbg=NONE ++ ++" Syntax name ++let b:current_syntax = "changes" +Index: vim71/runtime/filetype.vim +=================================================================== +--- vim71.orig/runtime/filetype.vim ++++ vim71/runtime/filetype.vim +@@ -369,6 +369,9 @@ au BufNewFile,BufRead *.css setf css + " Century Term Command Scripts (*.cmd too) + au BufNewFile,BufRead *.con setf cterm + ++" SuSE .changes file ++au BufNewFile,BufRead *.changes setf changes ++ + " Changelog + au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch + \ setf debchangelog diff --git a/vim-7.1-syntax_spec.patch b/vim-7.1-filetype_spec.patch similarity index 76% rename from vim-7.1-syntax_spec.patch rename to vim-7.1-filetype_spec.patch index e3f1eab..0709eb4 100644 --- a/vim-7.1-syntax_spec.patch +++ b/vim-7.1-filetype_spec.patch @@ -1,7 +1,7 @@ Index: runtime/syntax/spec.vim =================================================================== ---- runtime/syntax/spec.vim.orig 2005-01-04 10:46:51.000000000 +0100 -+++ runtime/syntax/spec.vim 2007-06-19 18:40:42.239681906 +0200 +--- runtime/syntax/spec.vim.orig ++++ runtime/syntax/spec.vim @@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment @@ -11,3 +11,16 @@ Index: runtime/syntax/spec.vim "%% Changelog Section %% syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense +Index: runtime/filetype.vim +=================================================================== +--- runtime/filetype.vim.orig ++++ runtime/filetype.vim +@@ -1732,7 +1732,7 @@ endfunc + + + " Spec (Linux RPM) +-au BufNewFile,BufRead *.spec setf spec ++au BufNewFile,BufRead *.spec,*.spec.in setf spec + + " Speedup (AspenTech plant simulator) + au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup diff --git a/vim.changes b/vim.changes index de1892a..697d864 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 12 17:09:14 CET 2008 - mkoenig@suse.de + +- remove ycp syntax file, moved over to yast2-devtools +- cleanup: move syntax files and filetype changes into + unique patches + ------------------------------------------------------------------- Thu Feb 28 14:30:14 CET 2008 - mkoenig@suse.de diff --git a/vim.spec b/vim.spec index 57eaf7a..89eceed 100644 --- a/vim.spec +++ b/vim.spec @@ -13,7 +13,7 @@ Name: vim Version: 7.1 -Release: 93 +Release: 98 # License: Other uncritical OpenSource License; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi @@ -56,23 +56,19 @@ Source3: suse.vimrc Source4: vimrc_example1 Source5: vimrc_example2 Source6: ANNOUNCEMENT.vim-%{version} -Source7: ppd.vim Source8: suse.gvimrc Source9: README.SuSE Source10: README.Japanese-XIM -Source11: changes.vim -Source12: ycp.vim Source13: vitmp.c Source14: vitmp.1 Source15: vim132 Source16: gvim.png -Source17: apparmor.vim +#Source17: apparmor.vim Source18: missing-vim-client Source19: gvim.desktop Source99: vim-7.1-rpmlintrc Patch0: %{name}-upstream-patches-7.1-%{official_ptchlvl}.patch.bz2 Patch1: %{name}-7.0-no_nb.patch -Patch3: %{name}-7.0-filetype_ycp.patch Patch4: %{name}-7.0-gvimrc_fontset.patch Patch5: %{name}-7.0-highlight_fstab.patch Patch6: %{name}-7.0-sh_is_bash.patch @@ -83,12 +79,13 @@ Patch10: %{name}-7.0-name_vimrc.patch Patch11: %{name}-7.0-mktemp_tutor.patch Patch12: %{name}-7.0-ruby_ldflags_configure.patch Patch14: %{name}-7.0-grub.patch -Patch15: %{name}-7.0-apparmor.patch +Patch15: vim-7.0-filetype_apparmor.patch Patch16: %{name}-7.0-flex-array.diff Patch17: vim-7.1-ftplugin_changelog.patch -Patch18: vim-7.1-syntax_spec.patch +Patch18: vim-7.1-filetype_spec.patch Patch19: vim-7.1-diff_check.patch Patch20: vim-7.1-netrw_urlencode.patch +Patch21: vim-7.1-filetype_changes.patch # tbd??? %name-6.3-ga-utf8.diff # tbd??? %name-6.3-initvals.diff # tbd??? vim64-svn-crash.patch @@ -274,7 +271,6 @@ Authors: %setup -q -n %{VIM_SUBDIR} -b 1 -b 2 %patch %patch1 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -291,6 +287,7 @@ Authors: %patch18 %patch19 -p1 %patch20 -p1 +%patch21 -p1 cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} . rename no nb $RPM_BUILD_DIR/vim*/src/po/no.* rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no* @@ -399,8 +396,6 @@ touch %{buildroot}/etc/alternatives/vim # make the vim settings more generic %{__ln_s} -f %{VIM_SUBDIR} %{buildroot}%{_datadir}/vim/current # additional files -%{__install} -m 0644 %{S:7} %{S:11} %{S:12} \ - %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/syntax %{__install} -D -m 0644 %{S:3} %{buildroot}/etc/vimrc %{__install} -D -m 0644 %{S:8} %{buildroot}/etc/gvimrc # create site wide runtime directory @@ -655,6 +650,10 @@ fi %endif %changelog +* Wed Mar 12 2008 mkoenig@suse.de +- remove ycp syntax file, moved over to yast2-devtools +- cleanup: move syntax files and filetype changes into + unique patches * Thu Feb 28 2008 mkoenig@suse.de - update to patchlevel 266 * fixes crash on completion [bnc#361844] diff --git a/ycp.vim b/ycp.vim deleted file mode 100644 index 804cdc7..0000000 --- a/ycp.vim +++ /dev/null @@ -1,422 +0,0 @@ -" Vim syntax file -" Filename: ycp.vim -" Language: YCP: SuSE YaST2 scripting language -" Maintainer: Michal Svec -" Last change: 20.8.2003 - -" Remove any old syntax stuff hanging around -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -" YCP statements -syn keyword ycpStatement break return continue define global -syn keyword ycpStatement module import include textdomain - -" YCP conditionals -syn keyword ycpConditional if else -syn keyword ycpRepeat while do repeat until - -" YCP todos -syn keyword ycpTodo contained TODO FIXME XXX - -" YCP string and character constants -syn match ycpSpecial contained "\\x\x\+\|\\\o\{1,3\}\|\\.\|\\$" -syn region ycpString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=ycpSpecial -syn match ycpCharacter "'[^\\]'" -syn match ycpSpecialCharacter "'\\.'" -syn match ycpSpecialCharacter "'\\\o\{1,3\}'" - -" errors caused by wrong parenthesis -syn match ycpInParen contained "[{}]" - -" YCP numbers -syn case ignore -" integer number, or floating point number without a dot and with "f". -syn match ycpNumber "\<\d\+\(u\=l\=\|lu\|f\)\>" -" floating point number, with dot, optional exponent -syn match ycpFloat "\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>" -" floating point number, starting with a dot, optional exponent -syn match ycpFloat "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>" -" floating point number, without dot, with exponent -syn match ycpFloat "\<\d\+e[-+]\=\d\+[fl]\=\>" -" hex number -syn match ycpNumber "\<0x\x\+\(u\=l\=\|lu\)\>" -" identifier -" syn match ycpIdentifier "\<[a-z_][a-z0-9_]*\>" -syn case match -" flag an octal number with wrong digits -syn match ycpOctalError "\<0\o*[89]" - -" YCP coding errors -syn match ycpSpaceError excludenl "\s\+$" -syn match ycpSpaceError " \+\t"me=e-1 -syn match ycpCommentError "\*/" - -" YCP comments -syn region ycpComment start="/\*" end="\*/" contains=ycpTodo,ycpSpaceError -syn match ycpComment "//.*" contains=ycpTodo,ycpCommentError,ycpSpaceError - -"Operators and builtin functions -syn keyword ycpBuiltin is select remove change contains -syn keyword ycpBuiltin setcontains lookup haskey add union merge size -syn keyword ycpBuiltin symbolof sleep foreach filter maplist mapmap -syn keyword ycpBuiltin flatten toset sort sformat tointeger -syn keyword ycpBuiltin crypt cryptmd5 cryptbigcrypt cryptblowfish -syn keyword ycpBuiltin eval find isnil -syn keyword ycpBuiltin random srandom - -" WFM builtins -syn keyword ycpBuiltin WFM UI SCR Args -syn keyword ycpBuiltin Read Write Dir Execute -syn keyword ycpBuiltin CallFunction CallModule SetLanguage GetLanguage -syn keyword ycpBuiltin SCROpen SCRClose SCRGetName GetClientName -syn keyword ycpBuiltin SCRSetDefault SCRGetDefault - -" SCR builtins -syn keyword ycpBuiltin RegisterAgent -syn keyword ycpBuiltin UnregisterAgent UnregisterAllAgents -syn keyword ycpBuiltin MountAgent MountAllAgents -syn keyword ycpBuiltin UnmountAgent UnmountAllAgents -syn keyword ycpBuiltin YaST2Version SuSEVersion - -" YUI builtins -syn keyword ycpBuiltin AskForExistingDirectory -syn keyword ycpBuiltin AskForExistingFile -syn keyword ycpBuiltin AskForSaveFileName -syn keyword ycpBuiltin Beep -syn keyword ycpBuiltin BusyCursor -syn keyword ycpBuiltin ChangeWidget -syn keyword ycpBuiltin CheckShortcuts -syn keyword ycpBuiltin CloseDialog -syn keyword ycpBuiltin DumpWidgetTree -syn keyword ycpBuiltin FakeUserInput -syn keyword ycpBuiltin GetDisplayInfo -syn keyword ycpBuiltin GetLanguage -syn keyword ycpBuiltin GetModulename -syn keyword ycpBuiltin GetProductName -syn keyword ycpBuiltin Glyph -syn keyword ycpBuiltin HasSpecialWidget -syn keyword ycpBuiltin MakeScreenShot -syn keyword ycpBuiltin NormalCursor -syn keyword ycpBuiltin OpenDialog -syn keyword ycpBuiltin PlayMacro -syn keyword ycpBuiltin PollInput -syn keyword ycpBuiltin PostponeShortcutCheck -syn keyword ycpBuiltin QueryWidget -syn keyword ycpBuiltin RecalcLayout -syn keyword ycpBuiltin Recode -syn keyword ycpBuiltin RecordMacro -syn keyword ycpBuiltin RedrawScreen -syn keyword ycpBuiltin ReplaceWidget -syn keyword ycpBuiltin RunPkgSelection -syn keyword ycpBuiltin RunInTerminal -syn keyword ycpBuiltin SetConsoleFont -syn keyword ycpBuiltin SetFocus -syn keyword ycpBuiltin SetFunctionKeys -syn keyword ycpBuiltin SetKeyboard -syn keyword ycpBuiltin SetLanguage -syn keyword ycpBuiltin SetModulename -syn keyword ycpBuiltin SetProductName -syn keyword ycpBuiltin StopRecordMacro -syn keyword ycpBuiltin TimeoutUserInput -syn keyword ycpBuiltin UserInput -syn keyword ycpBuiltin WaitForEvent -syn keyword ycpBuiltin WidgetExists -syn keyword ycpBuiltin WizardCommand - -" YCP builtins -syn keyword ycpBuiltin contains -syn keyword ycpBuiltin haskey -syn keyword ycpBuiltin filter -syn keyword ycpBuiltin find -syn keyword ycpBuiltin maplist -syn keyword ycpBuiltin flatten -syn keyword ycpBuiltin sort -syn keyword ycpBuiltin toset -syn keyword ycpBuiltin tointeger -syn keyword ycpBuiltin tofloat -syn keyword ycpBuiltin tostring -syn keyword ycpBuiltin topath -syn keyword ycpBuiltin toterm -syn keyword ycpBuiltin crypt -syn keyword ycpBuiltin cryptmd5 -syn keyword ycpBuiltin cryptbigcrypt -syn keyword ycpBuiltin cryptblowfish -syn keyword ycpBuiltin timestring -syn keyword ycpBuiltin substring -syn keyword ycpBuiltin findfirstof -syn keyword ycpBuiltin findlastof -syn keyword ycpBuiltin findfirstnotof -syn keyword ycpBuiltin findlastnotof -syn keyword ycpBuiltin tolower -syn keyword ycpBuiltin toupper -syn keyword ycpBuiltin toascii -syn keyword ycpBuiltin filterchars -syn keyword ycpBuiltin deletechars -syn keyword ycpBuiltin time -syn keyword ycpBuiltin sleep -syn keyword ycpBuiltin random -syn keyword ycpBuiltin srandom -syn keyword ycpBuiltin sformat -syn keyword ycpBuiltin issubstring -syn keyword ycpBuiltin regexpmatch -syn keyword ycpBuiltin regexppos -syn keyword ycpBuiltin splitstring -syn keyword ycpBuiltin mergestring -syn keyword ycpBuiltin mapmap -syn keyword ycpBuiltin prepend -syn keyword ycpBuiltin listmap -syn keyword ycpBuiltin y2debug -syn keyword ycpBuiltin y2milestone -syn keyword ycpBuiltin y2warning -syn keyword ycpBuiltin regexpsub -syn keyword ycpBuiltin y2error -syn keyword ycpBuiltin y2security -syn keyword ycpBuiltin y2internal -syn keyword ycpBuiltin regexptokenize -syn keyword ycpBuiltin tohexstring - -" YCP types -syn keyword ycpType any void boolean integer float string locale -syn keyword ycpType symbol list map term path block declaration -syn keyword ycpType expression byteblock - -" YCP boolean -syn keyword ycpBoolean true false nil - -" YCP widgets -syn keyword ycpWidget Bottom -syn keyword ycpWidget CheckBox -syn keyword ycpWidget CheckBoxFrame -syn keyword ycpWidget ComboBox -syn keyword ycpWidget Empty -syn keyword ycpWidget Frame -syn keyword ycpWidget HBox -syn keyword ycpWidget HCenter -syn keyword ycpWidget HSpacing -syn keyword ycpWidget HSquash -syn keyword ycpWidget HStretch -syn keyword ycpWidget HVCenter -syn keyword ycpWidget HVSquash -syn keyword ycpWidget HVStretch -syn keyword ycpWidget HWeight -syn keyword ycpWidget Heading -syn keyword ycpWidget IconButton -syn keyword ycpWidget Image -syn keyword ycpWidget InputField -syn keyword ycpWidget IntField -syn keyword ycpWidget Label -syn keyword ycpWidget Left -syn keyword ycpWidget LogView -syn keyword ycpWidget MarginBox -syn keyword ycpWidget MenuButton -syn keyword ycpWidget MinHeight -syn keyword ycpWidget MinSize -syn keyword ycpWidget MinWidth -syn keyword ycpWidget MultiLineEdit -syn keyword ycpWidget MultiSelectionBox -syn keyword ycpWidget PackageSelector -syn keyword ycpWidget Password -syn keyword ycpWidget ProgressBar -syn keyword ycpWidget PushButton -syn keyword ycpWidget RadioButton -syn keyword ycpWidget RadioButtonGroup -syn keyword ycpWidget ReplacePoint -syn keyword ycpWidget RichText -syn keyword ycpWidget Right -syn keyword ycpWidget SelectionBox -syn keyword ycpWidget Table -syn keyword ycpWidget TextEntry -syn keyword ycpWidget Top -syn keyword ycpWidget Tree -syn keyword ycpWidget VBox -syn keyword ycpWidget VCenter -syn keyword ycpWidget VSpacing -syn keyword ycpWidget VSquash -syn keyword ycpWidget VStretch -syn keyword ycpWidget VWeight -syn keyword ycpWidget PkgSpecial -syn keyword ycpWidget BusyIndicator - -syn keyword ycpWidget BarGraph -syn keyword ycpWidget ColoredLabel -syn keyword ycpWidget Date -syn keyword ycpWidget DateField -syn keyword ycpWidget DownloadProgress -syn keyword ycpWidget DumbTab -syn keyword ycpWidget DummySpecialWidget -syn keyword ycpWidget HMultiProgressMeter -syn keyword ycpWidget VMultiProgressMeter -syn keyword ycpWidget PartitionSplitter -syn keyword ycpWidget PatternSelector -syn keyword ycpWidget Slider -syn keyword ycpWidget Time -syn keyword ycpWidget TimeField -syn keyword ycpWidget TimezoneSelector - -syn keyword ycpWidget CurrentButton -syn keyword ycpWidget CurrentItem -syn keyword ycpWidget Enabled -syn keyword ycpWidget ExpectedSize -syn keyword ycpWidget Filename -syn keyword ycpWidget Item -syn keyword ycpWidget Items -syn keyword ycpWidget Label -syn keyword ycpWidget Labels -syn keyword ycpWidget LastLine -syn keyword ycpWidget Notify -syn keyword ycpWidget SelectedItems -syn keyword ycpWidget ValidChars -syn keyword ycpWidget Value -syn keyword ycpWidget Values -syn keyword ycpWidget WindowID -syn keyword ycpWidget EasterEgg - -" YCP widget specials -syn keyword ycpWidgetSpecial animated -syn keyword ycpWidgetSpecial autoScrollDown -syn keyword ycpWidgetSpecial autoShortcut -syn keyword ycpWidgetSpecial boldFont -syn keyword ycpWidgetSpecial centered -syn keyword ycpWidgetSpecial countShowDelta -syn keyword ycpWidgetSpecial debugLayout -syn keyword ycpWidgetSpecial decorated -syn keyword ycpWidgetSpecial default -syn keyword ycpWidgetSpecial defaultsize -syn keyword ycpWidgetSpecial disabled -syn keyword ycpWidgetSpecial easterEgg -syn keyword ycpWidgetSpecial editable -syn keyword ycpWidgetSpecial hstretch -syn keyword ycpWidgetSpecial hvstretch -syn keyword ycpWidgetSpecial immediate -syn keyword ycpWidgetSpecial infocolor -syn keyword ycpWidgetSpecial invertAutoEnable -syn keyword ycpWidgetSpecial keepSorting -syn keyword ycpWidgetSpecial keyEvents -syn keyword ycpWidgetSpecial mainDialog -syn keyword ycpWidgetSpecial noAutoEnable -syn keyword ycpWidgetSpecial notify -syn keyword ycpWidgetSpecial outputField -syn keyword ycpWidgetSpecial plainText -syn keyword ycpWidgetSpecial repoMode -syn keyword ycpWidgetSpecial scaleToFit -syn keyword ycpWidgetSpecial searchMode -syn keyword ycpWidgetSpecial shrinkable -syn keyword ycpWidgetSpecial stepsEnabled -syn keyword ycpWidgetSpecial summaryMode -syn keyword ycpWidgetSpecial testMode -syn keyword ycpWidgetSpecial tiled -syn keyword ycpWidgetSpecial updateMode -syn keyword ycpWidgetSpecial vstretch -syn keyword ycpWidgetSpecial warncolor -syn keyword ycpWidgetSpecial youMode -syn keyword ycpWidgetSpecial zeroHeight -syn keyword ycpWidgetSpecial zeroWidth - -syn keyword ycpWidgetSpecial key_F1 -syn keyword ycpWidgetSpecial key_F2 -syn keyword ycpWidgetSpecial key_F3 -syn keyword ycpWidgetSpecial key_F4 -syn keyword ycpWidgetSpecial key_F5 -syn keyword ycpWidgetSpecial key_F6 -syn keyword ycpWidgetSpecial key_F7 -syn keyword ycpWidgetSpecial key_F8 -syn keyword ycpWidgetSpecial key_F9 -syn keyword ycpWidgetSpecial key_F10 -syn keyword ycpWidgetSpecial key_F11 -syn keyword ycpWidgetSpecial key_F12 -syn keyword ycpWidgetSpecial key_F13 -syn keyword ycpWidgetSpecial key_F14 -syn keyword ycpWidgetSpecial key_F15 -syn keyword ycpWidgetSpecial key_F16 -syn keyword ycpWidgetSpecial key_F17 -syn keyword ycpWidgetSpecial key_F18 -syn keyword ycpWidgetSpecial key_F19 -syn keyword ycpWidgetSpecial key_F20 -syn keyword ycpWidgetSpecial key_F21 -syn keyword ycpWidgetSpecial key_F22 -syn keyword ycpWidgetSpecial key_F23 -syn keyword ycpWidgetSpecial key_F24 -syn keyword ycpWidgetSpecial key_none - -syn keyword ycpWidgetSpecial ArrowLeft -syn keyword ycpWidgetSpecial ArrowRight -syn keyword ycpWidgetSpecial ArrowUp -syn keyword ycpWidgetSpecial ArrowDown - -syn keyword ycpWidgetSpecial CheckMark -syn keyword ycpWidgetSpecial BulletArrowRight -syn keyword ycpWidgetSpecial BulletCircle -syn keyword ycpWidgetSpecial BulletSquare - -syn keyword ycpWidgetSpecial id -syn keyword ycpWidgetSpecial opt -syn keyword ycpWidgetSpecial icon -syn keyword ycpWidgetSpecial item -syn keyword ycpWidgetSpecial cell -syn keyword ycpWidgetSpecial menu -syn keyword ycpWidgetSpecial header -syn keyword ycpWidgetSpecial rgb -syn keyword ycpWidgetSpecial leftMargin -syn keyword ycpWidgetSpecial rightMargin -syn keyword ycpWidgetSpecial topMargin -syn keyword ycpWidgetSpecial bottomMargin -syn keyword ycpWidgetSpecial BackgroundPixmap - -" comment miniles -if !exists("c_minlines") - let c_minlines = 15 -endif -exec "syn sync ccomment cComment minlines=" . c_minlines - -" highliting colors -if version >= 508 || !exists("did_basic_syntax_inits") - if version < 508 - let did_basic_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink ycpLabel Label - HiLink ycpUserLabel Label - HiLink ycpConditional Conditional - HiLink ycpRepeat Repeat - HiLink ycpCharacter Character - HiLink ycpSpecialCharacter ycpSpecial - HiLink ycpNumber Number - HiLink ycpFloat Float - HiLink ycpOctalError ycpError - HiLink ycpParenError ycpError - HiLink ycpInParen ycpError - HiLink ycpCommentError ycpError - HiLink ycpSpaceError ycpError - HiLink ycpBuiltin Operator - HiLink ycpStructure Structure - HiLink ycpStorageClass StorageClass - HiLink ycpInclude Include - HiLink ycpPreProc PreProc - HiLink ycpDefine Macro - HiLink ycpIncluded ycpString - HiLink ycpError Error - HiLink ycpStatement Statement - HiLink ycpPreCondit PreCondit - HiLink ycpType Type - HiLink ycpCommentError ycpError - HiLink ycpCommentSkip ycpComment - HiLink ycpString String - HiLink ycpComment Comment - HiLink ycpSpecial SpecialChar - HiLink ycpTodo Todo - HiLink ycpWidget Function - HiLink ycpWidgetSpecial Special - HiLink ycpBoolean Boolean - - delcommand HiLink -endif - -" syntax name -let b:current_syntax = "ycp"