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 #6337)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index a6c8956542fd4c214bf3b2e242486509031b1af1..3778fe5ff851c80bdf861d3fb558b95a356ced82 100644 (file)
--- 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

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 38339aefec1c3da2b45a40937a9f2bf308a732f4..8ec8355c2461c244c5fc1f6906c8a63252ff0223 100644 (file)
--- 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'],

diff --git a/src/version.c b/src/version.c
index aff4583e948cc1a74a7b569f8572e08bbcde8c41..ca08dff59b999184df53a1c06008ae1d6d912e68 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1060,
 /**/
     1059,
 /**/