patch 9.1.1886: filetype: Android aconfig files are not recognized
Commit:
https://github.com/vim/vim/commit/7adeb09bb24a9d29179926dd391c3d67cea26057
Author: Bruno Belanyi <[email protected]>
Date: Tue Oct 28 20:31:55 2025 +0000
patch 9.1.1886: filetype: Android aconfig files are not recognized
Problem: filetype: Android aconfig files are not recognized
Solution: Detect *.aconfig files as pbtxt filetype (Bruno Belanyi)
Reference:
https://source.android.com/docs/setup/build/feature-flagging/declare-flag
closes: #18656
Signed-off-by: Bruno Belanyi <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 39ee2a94c..791dccf67 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -3,7 +3,7 @@ vim9script
# Vim functions for file type detection
#
# Maintainer: The Vim Project <https://github.com/vim/vim>
-# Last Change: 2025 Oct 09
+# Last Change: 2025 Oct 28
# Former Maintainer: Bram Moolenaar <[email protected]>
# These functions are moved here from runtime/filetype.vim to make startup
@@ -2473,6 +2473,7 @@ const ft_from_ext = {
"textproto": "pbtxt",
"textpb": "pbtxt",
"pbtxt": "pbtxt",
+ "aconfig": "pbtxt", # Android aconfig files
# Poke
"pk": "poke",
# Nvidia PTX (Parallel Thread Execution)
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index e3cc298ba..f7d95082d 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -603,7 +603,7 @@ def s:GetFilenameChecks(): dict<list<string>>
papp: ['file.papp', 'file.pxml', 'file.pxsl'],
pascal: ['file.pas', 'file.dpr', 'file.lpr'],
passwd: ['any/etc/passwd', 'any/etc/passwd-', 'any/etc/passwd.edit',
'any/etc/shadow', 'any/etc/shadow-', 'any/etc/shadow.edit',
'any/var/backups/passwd.bak', 'any/var/backups/shadow.bak', '/etc/passwd',
'/etc/passwd-', '/etc/passwd.edit', '/etc/shadow', '/etc/shadow-',
'/etc/shadow.edit', '/var/backups/passwd.bak', '/var/backups/shadow.bak'],
- pbtxt: ['file.txtpb', 'file.textproto', 'file.textpb', 'file.pbtxt'],
+ pbtxt: ['file.txtpb', 'file.textproto', 'file.textpb', 'file.pbtxt',
'file.aconfig'],
pccts: ['file.g'],
pcmk: ['file.pcmk'],
pdf: ['file.pdf'],
diff --git a/src/version.c b/src/version.c
index 7b814f726..f52904b53 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1886,
/**/
1885,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1vDqZ0-008OgX-8H%40256bit.org.
