Patch 8.2.3603

[Bram Moolenaar]

Patch 8.2.3603
Problem: Fish filetype not recognized.
Solution: Add a file pattern and match script line. (Doug Kearns)
Files: runtime/filetype.vim, runtime/scripts.vim,
src/testdir/test_filetype.vim


*** ../vim-8.2.3602/runtime/filetype.vim 2021-11-16 11:10:08.337448702 +0000
--- runtime/filetype.vim 2021-11-16 15:24:43.120226431 +0000
***************
*** 617,622 ****
--- 617,625 ----
" Fetchmail RC file
au BufNewFile,BufRead .fetchmailrc setf fetchmail

+ " Fish shell
+ au BufNewFile,BufRead *.fish setf fish
+
" FlexWiki - disabled, because it has side effects when a .wiki file
" is not actually FlexWiki
"au BufNewFile,BufRead *.wiki setf flexwiki
*** ../vim-8.2.3602/runtime/scripts.vim 2021-11-16 11:53:09.449121757 +0000
--- runtime/scripts.vim 2021-11-16 15:24:43.120226431 +0000
***************
*** 194,199 ****
--- 194,203 ----
elseif s:name =~# 'rsc\>'
set ft=routeros

+ " Fish shell
+ elseif s:name =~# 'fish\>'
+ set ft=fish
+
endif
unlet s:name

*** ../vim-8.2.3602/src/testdir/test_filetype.vim 2021-11-16 11:10:08.337448702 +0000
--- src/testdir/test_filetype.vim 2021-11-16 15:24:43.120226431 +0000
***************
*** 180,185 ****
--- 180,186 ----
\ 'fennel': ['file.fnl'],
\ 'fetchmail': ['.fetchmailrc'],
\ 'fgl': ['file.4gl', 'file.4gh', 'file.m4gl'],
+ \ 'fish': ['file.fish'],
\ 'focexec': ['file.fex', 'file.focexec'],
\ 'forth': ['file.fs', 'file.ft', 'file.fth'],
\ 'fortran': ['file.f', 'file.for', 'file.fortran', 'file.fpp', 'file.ftn', 'file.f77', 'file.f90', 'file.f95', 'file.f03', 'file.f08'],
***************
*** 662,667 ****
--- 663,669 ----
\ 'pascal': [['#!/path/instantfpc']],
\ 'fennel': [['#!/path/fennel']],
\ 'routeros': [['#!/path/rsc']],
+ \ 'fish': [['#!/path/fish']],
\ }

" Various forms of "env" optional arguments.
*** ../vim-8.2.3602/src/version.c 2021-11-16 13:08:53.338904944 +0000
--- src/version.c 2021-11-16 15:27:17.935785907 +0000
***************
*** 759,760 ****
--- 759,762 ----
{ /* Add new patch number below this line */
+ /**/
+ 3603,
/**/

--
ARTHUR: What?
BLACK KNIGHT: None shall pass.
ARTHUR: I have no quarrel with you, good Sir knight, but I must cross
this bridge.
BLACK KNIGHT: Then you shall die.
The Quest for the Holy Grail (Monty Python)

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///