summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2008-05-28 15:32:20 +0000
committervimboss <devnull@localhost>2008-05-28 15:32:20 +0000
commitd0f1cc7b58d95af56bb987384b43930bf9479d11 (patch)
tree0fffea5aa737c7d432725a4362e3becfc22fccd8
parent5f1250811ba355621bdf08ed00dd2a904ea43967 (diff)
downloadvim-d0f1cc7b58d95af56bb987384b43930bf9479d11.tar.gz
updated for version 7.1-300v7.1.300v7-1-300
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e20a53ae..be0e1cc5 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -190,7 +190,7 @@ func! s:FTasmsyntax()
let head = " ".getline(1)." ".getline(2)." ".getline(3)." ".getline(4).
\" ".getline(5)." "
if head =~ '\sasmsyntax=\S\+\s'
- let b:asmsyntax = substitute(head, '.*\sasmsyntax=\(\S\+\)\s.*','\1', "")
+ let b:asmsyntax = substitute(head, '.*\sasmsyntax=\([a-zA-Z0-9]\+\)\s.*','\1', "")
elseif ((head =~? '\.title') || (head =~? '\.ident') || (head =~? '\.macro') || (head =~? '\.subtitle') || (head =~? '\.library'))
let b:asmsyntax = "vmasm"
endif
diff --git a/src/version.c b/src/version.c
index 7b7bdcd0..60fb612e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 300,
+/**/
299,
/**/
298,