summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-08-08 18:54:11 +0000
committerBram Moolenaar <Bram@vim.org>2006-08-08 18:54:11 +0000
commita8c4d5635c318c27f7255499a95601ba6a962cb7 (patch)
tree16324cc28ad7f8b617fed4274f058514029c15d8
parentc4c25bfd121c98ac2031507d692489226aa12293 (diff)
downloadvim-a8c4d5635c318c27f7255499a95601ba6a962cb7.zip
updated for version 7.0-049
-rw-r--r--runtime/scripts.vim8
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index e709d9544..275b7ebc1 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types in scripts
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last change: 2006 Mar 28
+" Last change: 2006 Jul 08
" This file is called by an autocommand for every file that has just been
" loaded into a buffer. It checks if the type of file can be recognized by
@@ -54,6 +54,12 @@ if s:line1 =~ "^#!"
let s:name = substitute(s:line1, '^#!\s*\S*[/\\]\(\i\+\).*', '\1', '')
endif
+ " tcl scripts may have #!/bin/sh in the first line and "exec wish" in the
+ " third line. Suggested by Steven Atkinson.
+ if getline(3) =~ '^exec wish'
+ let s:name = 'wish'
+ endif
+
" Bourne-like shell scripts: bash bash2 ksh ksh93 sh
if s:name =~ '^\(bash\d*\|\|ksh\d*\|sh\)\>'
call SetFileTypeSH(s:line1) " defined in filetype.vim
diff --git a/src/version.c b/src/version.c
index e2c8c3929..fffb90bf7 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 */
/**/
+ 49,
+/**/
48,
/**/
47,