-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I know this is sortof late notice, but it would be great if this could go in 7.1
final :)

> The empty comment is still there.  Just leave that line blank.  No
> biggie, of course, just aesthetics.

i could have sworn i fixed it. this time, though, it really is fixed. :)

>> runtime! syntax/python.vim
>
> Just to make sure: Python is allowed anywhere in a conary recipe?

correct. a recipe is a special type of python file

>> syn match   conaryMacro         "%(\w*)[sd]" contained
>> syn match   conaryBadMacro      "%(\w*)[^sd]" contained " no final marker
>
> OK, so you can have the following:
>
> %()s
>
> or should it be "%(\w\+)[sd]"

you're right. fixed

>>   HiLink conaryUseFlag          Typedef
>
> Substitute that with
> hi def link conaryrecipeMacro Macro
> :
> :

fixed

> (If conary recipe macros aren't much like macros in C, then perhaps
> Special is better.  Also note the linking of a generic group to
> function and then other groups linking to them so that a user can
> change them all en masse, to something they like.)

fixed

> That HiLink cruft is also Vim5 compatibility stuff.  And remove the if
> statement.

fixed

>> let b:current_syntax = "recipe"
>
> This should be
>
> let b:current_syntax = "conaryrecipe"

fixed

smithj

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.3 (GNU/Linux)

iD8DBQFGP13N0e1Yawpq2XMRAk7+AKCZoBtDszC/FZpK6m9bZFPMKXHnoQCgjVGu
gstfvNHYnhUHmyzQ8sMxAvI=
=Y9Ve
-----END PGP SIGNATURE-----
" Vim syntax file
" Language:     Conary Recipe
" Maintainer:   rPath Inc <http://www.rpath.com>
" Updated:      2007-05-07

if exists("b:current_syntax")
  finish
endif

runtime! syntax/python.vim
syn keyword conarySFunction     mainDir addAction addSource addArchive addPatch
syn keyword conarySFunction     addRedirect addSvnSnapshot addMercurialSnapshot
syn keyword conarySFunction     addCvsSnapshot

syn keyword conaryGFunction     add addAll addNewGroup addReference createGroup
syn keyword conaryGFunction     addNewGroup startGroup remove removeComponents
syn keyword conaryGFunction     replace setByDefault setDefaultGroup 
syn keyword conaryGFunction     setLabelPath addCopy setSearchPath

syn keyword conaryBFunction     Run Automake Configure ManualConfigure 
syn keyword conaryBFunction     Make MakeParallelSubdir MakeInstall
syn keyword conaryBFunction     MakePathsInstall CompilePython
syn keyword conaryBFunction     Ldconfig Desktopfile Environment SetModes
syn keyword conaryBFunction     Install Copy Move Symlink Link Remove Doc
syn keyword conaryBFunction     Create MakeDirs disableParallelMake
syn keyword conaryBFunction     ConsoleHelper Replace SGMLCatalogEntry
syn keyword conaryBFunction     XInetdService XMLCatalogEntry TestSuite
syn keyword conaryBFunction     PythonSetup

syn keyword conaryPFunction     NonBinariesInBindirs FilesInMandir 
syn keyword conaryPFunction     ImproperlyShared CheckSonames CheckDestDir
syn keyword conaryPFunction     ComponentSpec PackageSpec 
syn keyword conaryPFunction     Config InitScript GconfSchema SharedLibrary
syn keyword conaryPFunction     ParseManifest MakeDevices DanglingSymlinks
syn keyword conaryPFunction     AddModes WarnWriteable IgnoredSetuid
syn keyword conaryPFunction     Ownership ExcludeDirectories
syn keyword conaryPFunction     BadFilenames BadInterpreterPaths ByDefault
syn keyword conaryPFunction     ComponentProvides ComponentRequires Flavor
syn keyword conaryPFunction     EnforceConfigLogBuildRequirements Group
syn keyword conaryPFunction     EnforceSonameBuildRequirements InitialContents
syn keyword conaryPFunction     FilesForDirectories LinkCount
syn keyword conaryPFunction     MakdeDevices NonMultilibComponent ObsoletePaths
syn keyword conaryPFunction     NonMultilibDirectories NonUTF8Filenames TagSpec
syn keyword conaryPFunction     Provides RequireChkconfig Requires TagHandler
syn keyword conaryPFunction     TagDescription Transient User UtilizeGroup
syn keyword conaryPFunction     WorldWritableExecutables UtilizeUser
syn keyword conaryPFunction     WarnWritable Strip CheckDesktopFiles

" Most destdirPolicy aren't called from recipes, except for these
syn keyword conaryPFunction     AutoDoc RemoveNonPackageFiles TestSuiteFiles
syn keyword conaryPFunction     TestSuiteLinks

syn match   conaryMacro         "%(\w\+)[sd]" contained
syn match   conaryBadMacro      "%(\w*)[^sd]" contained " no final marker
syn keyword conaryArches        contained x86 x86_64 alpha ia64 ppc ppc64 s390
syn keyword conaryArches        contained sparc sparc64
syn keyword conarySubArches     contained sse2 3dnow 3dnowext cmov i486 i586
syn keyword conarySubArches     contained i686 mmx mmxext nx sse sse2
syn keyword conaryBad           RPM_BUILD_ROOT EtcConfig InstallBucket subDir 
subdir 
syn keyword conaryBad           RPM_OPT_FLAGS 
syn cluster conaryArchFlags     contains=conaryArches,conarySubArches
syn match   conaryArch          "Arch\.[a-z0-9A-Z]\+" 
contains=conaryArches,conarySubArches
syn match   conaryArch          "Arch\.[a-z0-9A-Z]\+" 
contains=conaryArches,conarySubArches
syn keyword conaryKeywords      name buildRequires version clearBuildReqs
syn keyword conaryUseFlag       contained pcre tcpwrappers gcj gnat selinux pam 
syn keyword conaryUseFlag       contained bootstrap python perl 
syn keyword conaryUseFlag       contained readline gdbm emacs krb builddocs 
syn keyword conaryUseFlag       contained alternatives tcl tk X gtk gnome qt
syn keyword conaryUseFlag       contained xfce gd ldap sasl pie desktop ssl kde
syn keyword conaryUseFlag       contained slang netpbm nptl ipv6 buildtests
syn keyword conaryUseFlag       contained ntpl xen dom0 domU
syn match   conaryUse           "Use\.[a-z0-9A-Z]\+" contains=conaryUseFlag

" strings
syn region pythonString         matchgroup=Normal start=+[uU]\='+ end=+'+ 
skip=+\\\\\|\\'+ contains=pythonEscape,conaryMacro,conaryBadMacro
syn region pythonString         matchgroup=Normal start=+[uU]\="+ end=+"+ 
skip=+\\\\\|\\"+ contains=pythonEscape,conaryMacro,conaryBadMacro
syn region pythonString         matchgroup=Normal start=+[uU]\="""+ end=+"""+ 
contains=pythonEscape,conaryMacro,conaryBadMacro
syn region pythonString         matchgroup=Normal start=+[uU]\='''+ end=+'''+ 
contains=pythonEscape,conaryMacro,conaryBadMacro
syn region pythonRawString      matchgroup=Normal start=+[uU]\=[rR]'+ end=+'+ 
skip=+\\\\\|\\'+ contains=conaryMacro,conaryBadMacro
syn region pythonRawString      matchgroup=Normal start=+[uU]\=[rR]"+ end=+"+ 
skip=+\\\\\|\\"+ contains=conaryMacro,conaryBadMacro
syn region pythonRawString      matchgroup=Normal start=+[uU]\=[rR]"""+ 
end=+"""+ contains=conaryMacro,conaryBadMacro
syn region pythonRawString      matchgroup=Normal start=+[uU]\=[rR]'''+ 
end=+'''+ contains=conaryMacro,conaryBadMacro

hi def link conaryMacro                 Special
hi def link conaryrecipeFunction        Function
hi def link conaryError                 Error
hi def link conaryBFunction             conaryrecipeFunction
hi def link conaryGFunction             conaryrecipeFunction
hi def link conarySFunction             Operator
hi def link conaryPFunction             Typedef
hi def link conaryFlags                 PreCondit
hi def link conaryArches                Special
hi def link conarySubArches             Special
hi def link conaryBad                   conaryError
hi def link conaryBadMacro              conaryError
hi def link conaryKeywords              Special
hi def link conaryUseFlag               Typedef

let b:current_syntax = "conaryrecipe"
--- vim63/runtime/filetype.vim.old	2005-07-29 18:16:25.000000000 -0400
+++ vim63/runtime/filetype.vim	2005-07-29 18:16:32.000000000 -0400
@@ -1216,6 +1216,9 @@
   endif
 endfun
 
+" Conary Recipe
+au BufNewFile,BufRead *.recipe		        setf conaryrecipe
+
 " Remind
 au BufNewFile,BufRead .reminders*		setf remind
 

Attachment: conaryrecipe.vim.sig
Description: Binary data

Attachment: conaryRecipe.patch.sig
Description: Binary data

Reply via email to