diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-26 20:23:45 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-26 20:23:45 +0200 |
| commit | 5f36d5fbb836e6fdeb9e3b2c26edb88e45150db4 (patch) | |
| tree | 863f22cc278ceeaefb95a791fa46507a0f12a470 | |
| parent | cf8441704d6e517bda1899f4afa82c6b4eecbaec (diff) | |
patch 8.2.1060: not all elinks files are recognizedv8.2.1060
Problem: Not all elinks files are recognized.
Solution: Just check for "elinks.conf". (Guido Cella, closes #6337)
| -rw-r--r-- | runtime/filetype.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index a6c8956542..3778fe5ff8 100644 --- 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 38339aefec..8ec8355c24 100644 --- 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 aff4583e94..ca08dff59b 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 */ /**/ + 1060, +/**/ 1059, /**/ 1058, |