From 48f1d6442d5d255d1b5a353160bff7470afa74cb Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Sun, 14 Sep 2025 18:13:11 +0000 Subject: [PATCH] patch 9.1.1759: filetype: generic log detection is too disturbing Problem: filetype: generic log detection is too disturbing (after v9.1.1755) Solution: Revert setting log filetype Signed-off-by: Christian Brabandt --- runtime/filetype.vim | 5 +++-- src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index a68830e71e..629d3a1d0d 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: The Vim Project -" Last Change: 2025 Aug 31 +" Last Change: 2025 Sep 14 " Former Maintainer: Bram Moolenaar " Listen very carefully, I will say this only once @@ -3411,7 +3411,8 @@ au BufNewFile,BufRead *.blp setf blueprint au BufNewFile,BufRead *.bp setf bp " Generic log file -au BufNewFile,BufRead *.log,*_log,*.LOG,*_LOG setf log +" Disabled cause it is too distracting +" au BufNewFile,BufRead *.log,*_log,*.LOG,*_LOG setf log " Use the filetype detect plugins. They may overrule any of the previously " detected filetypes. diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 22d9f850fa..05194cf338 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -454,7 +454,7 @@ def s:GetFilenameChecks(): dict> lite: ['file.lite', 'file.lt'], litestep: ['/LiteStep/any/file.rc', 'any/LiteStep/any/file.rc'], livebook: ['file.livemd'], - log: ['file.log', 'file_log', 'file.LOG', 'file_LOG'], +# log: ['file.log', 'file_log', 'file.LOG', 'file_LOG'], logcheck: ['/etc/logcheck/file.d-some/file', '/etc/logcheck/file.d/file', 'any/etc/logcheck/file.d-some/file', 'any/etc/logcheck/file.d/file'], loginaccess: ['/etc/login.access', 'any/etc/login.access'], logindefs: ['/etc/login.defs', 'any/etc/login.defs'], diff --git a/src/version.c b/src/version.c index e550f2f479..b67476457d 100644 --- a/src/version.c +++ b/src/version.c @@ -724,6 +724,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1759, /**/ 1758, /**/