misc/vim/syntax/factor.vim: merge two factorComment highlight groups together into one

diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen
index 346e4164a9f409c81231842eeade6de4cdede9f7..110eadfd3ae69758fcef7a34580a5eb01dee3f7f 100644 (file)
--- a/misc/factor.vim.fgen
+++ b/misc/factor.vim.fgen
@@ -12,7 +12,7 @@ IN: factor.vim.fgen
 " Vim syntax file
 " Language: Factor
 " Maintainer: Alex Chapman <chapman.alex@gmail.com>
-" Last Change: 2011 Apr 04
+" Last Change: 2011 Apr 06
 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" <fhtml> call-template
 
 " For version 5.x: Clear all syntax items
@@ -36,9 +36,8 @@ endif
 syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorExecute,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorMBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorError,factorStruct
 
 syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained
-syn match factorComment /\<!\>\s.*/ contains=factorTodo,@Spell
-syn match factorComment /\<#!\>\s.*/ contains=factorTodo,@Spell
-syn match factorShebang /\%\^#!\s.*/ display
+syn match factorComment /\<#\?!\>.*/ contains=factorTodo,@Spell
+syn match factorShebang /\%\^#!.*/ display
 syn match factorShebangErr /\%\^#!\S\+/
 
 syn cluster factorDefnContents contains=@factorCluster,factorStackEffect,factorLiteralStackEffect,factorArray0,factorQuotation0

diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim
index 28bcad901aa6e20df1c2711d6cf05fbc361e4644..5cea099f45c1e572478391c14fc6efab3a2fa4fb 100644 (file)
--- a/misc/vim/syntax/factor.vim
+++ b/misc/vim/syntax/factor.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language: Factor
 " Maintainer: Alex Chapman <chapman.alex@gmail.com>
-" Last Change: 2011 Apr 04
+" Last Change: 2011 Apr 06
 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" <fhtml> call-template
 
 " For version 5.x: Clear all syntax items
@@ -25,9 +25,8 @@ endif
 syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorExecute,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorMBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorError,factorStruct
 
 syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained
-syn match factorComment /\<!\>\s.*/ contains=factorTodo,@Spell
-syn match factorComment /\<#!\>\s.*/ contains=factorTodo,@Spell
-syn match factorShebang /\%\^#!\s.*/ display
+syn match factorComment /\<#\?!\>.*/ contains=factorTodo,@Spell
+syn match factorShebang /\%\^#!.*/ display
 syn match factorShebangErr /\%\^#!\S\+/
 
 syn cluster factorDefnContents contains=@factorCluster,factorStackEffect,factorLiteralStackEffect,factorArray0,factorQuotation0