summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/testdir/test_filetype.vim5
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index dfbfaabaec..ae6dc6f1d3 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -184,7 +184,7 @@ au BufNewFile,BufRead *.at setf m4
au BufNewFile,BufRead *.ave setf ave
" Awk
-au BufNewFile,BufRead *.awk setf awk
+au BufNewFile,BufRead *.awk,*.gawk setf awk
" B
au BufNewFile,BufRead *.mch,*.ref,*.imp setf b
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index cd72008173..8b9f5565da 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -73,7 +73,7 @@ let s:filename_checks = {
\ 'autoit': ['file.au3'],
\ 'automake': ['GNUmakefile.am'],
\ 'ave': ['file.ave'],
- \ 'awk': ['file.awk'],
+ \ 'awk': ['file.awk', 'file.gawk'],
\ 'b': ['file.mch', 'file.ref', 'file.imp'],
\ 'bc': ['file.bc'],
\ 'bdf': ['file.bdf'],
@@ -597,7 +597,8 @@ let s:script_checks = {
\ 'bc': [['#!/path/bc']],
\ 'sed': [['#!/path/sed']],
\ 'ocaml': [['#!/path/ocaml']],
- \ 'awk': [['#!/path/awk']],
+ \ 'awk': [['#!/path/awk'],
+ \ ['#!/path/gawk']],
\ 'wml': [['#!/path/wml']],
\ 'scheme': [['#!/path/scheme']],
\ 'cfengine': [['#!/path/cfengine']],
diff --git a/src/version.c b/src/version.c
index 4c191e2209..b389ee560a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1458,
+/**/
1457,
/**/
1456,