summaryrefslogtreecommitdiff
path: root/runtime/syntax/asm.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-05-14 23:24:24 +0200
committerBram Moolenaar <Bram@vim.org>2010-05-14 23:24:24 +0200
commit00a927d62b68a3523cb1c4f9aa3f7683345c8182 (patch)
tree9138abae11d363aa87818791195edf6e85aef15d /runtime/syntax/asm.vim
parentf1eeae94fd78f81d85d2abe3d955dc21d5ef979c (diff)
downloadvim-git-00a927d62b68a3523cb1c4f9aa3f7683345c8182.tar.gz
Updated runtime files.
Diffstat (limited to 'runtime/syntax/asm.vim')
-rw-r--r--runtime/syntax/asm.vim17
1 files changed, 14 insertions, 3 deletions
diff --git a/runtime/syntax/asm.vim b/runtime/syntax/asm.vim
index 40756de95..6b8ce1ed5 100644
--- a/runtime/syntax/asm.vim
+++ b/runtime/syntax/asm.vim
@@ -3,7 +3,9 @@
" Maintainer: Erik Wognsen <erik.wognsen@gmail.com>
" Previous maintainer:
" Kevin Dahlhausen <kdahlhaus@yahoo.com>
-" Last Change: 2010 Jan 9
+" Last Change: 2010 Apr 18
+
+" Thanks to Ori Avtalion for feedback on the comment markers!
" For version 5.x: Clear all syntax items
" For version 6.0 and later: Quit when a syntax file was already loaded
@@ -45,8 +47,16 @@ syn match octNumber "0[0-7][0-7]\+"
syn match hexNumber "0[xX][0-9a-fA-F]\+"
syn match binNumber "0[bB][0-1]*"
-syn match asmComment "#.*"
-syn region asmComment start="/\*" end="\*/"
+syn keyword asmTodo contained TODO
+
+" GAS supports various comment markers as described here:
+" http://sourceware.org/binutils/docs-2.19/as/Comments.html
+" I have commented out the ARM comment marker "@" by default as I think more
+" people are using "@" with the .type directive. See
+" http://sourceware.org/binutils/docs-2.19/as/Type.html
+syn region asmComment start="/\*" end="\*/" contains=asmTodo
+syn match asmComment "[#;!|].*" contains=asmTodo
+" syn match asmComment "@.*" contains=asmTodo
syn match asmInclude "\.include"
syn match asmCond "\.if"
@@ -75,6 +85,7 @@ if version >= 508 || !exists("did_asm_syntax_inits")
HiLink asmSection Special
HiLink asmLabel Label
HiLink asmComment Comment
+ HiLink asmTodo Todo
HiLink asmDirective Statement
HiLink asmInclude Include