changeset 21018:2b07e2e7d95b v8.2.1060

patch 8.2.1060: not all elinks files are recognized Commit: https://github.com/vim/vim/commit/5f36d5fbb836e6fdeb9e3b2c26edb88e45150db4 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jun 26 20:23:45 2020 +0200 patch 8.2.1060: not all elinks files are recognized Problem: Not all elinks files are recognized. Solution: Just check for "elinks.conf". (Guido Cella, closes https://github.com/vim/vim/issues/6337)
author Bram Moolenaar <Bram@vim.org>
date Fri, 26 Jun 2020 20:30:04 +0200
parents 8be79b5e88ca
children f5dae5cbcdec
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -542,7 +542,7 @@ au BufNewFile,BufRead *.ecd			setf ecd
 au BufNewFile,BufRead *.e,*.E			call dist#ft#FTe()
 
 " Elinks configuration
-au BufNewFile,BufRead */etc/elinks.conf,*/.elinks/elinks.conf	setf elinks
+au BufNewFile,BufRead elinks.conf		setf elinks
 
 " ERicsson LANGuage; Yaws is erlang too
 au BufNewFile,BufRead *.erl,*.hrl,*.yaws	setf erlang
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -150,7 +150,7 @@ let s:filename_checks = {
     \ 'dylanlid': ['file.lid'],
     \ 'ecd': ['file.ecd'],
     \ 'edif': ['file.edf', 'file.edif', 'file.edo'],
-    \ 'elinks': ['/etc/elinks.conf', '/.elinks/elinks.conf'],
+    \ 'elinks': ['elinks.conf'],
     \ 'elm': ['file.elm'],
     \ 'elmfilt': ['filter-rules'],
     \ 'erlang': ['file.erl', 'file.hrl', 'file.yaws'],
--- 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 */
 /**/
+    1060,
+/**/
     1059,
 /**/
     1058,