patch 9.2.0191: Not possible to know if Vim was compiled with Android support

Problem:  The "android" and "termux" feature flags have been shipped in
          Termux's downstream vim / vim-gtk package for 5+ years but were
          never properly documented in the downstream patch.
Solution: Upstream the "android" and "termux" feature flags into Vim as
          decoupled feature flags, this enables the "android" feature in
          particular to be available independently of the "termux"
          feature for builds of Vim against the Android NDK, but not
          including the Termux NDK patchset.

closes: #19623

Co-authored-by: Lethal Lisa <43791059+lethal-lisa@users.noreply.github.com>
Co-authored-by: shadmansaleh <13149513+shadmansaleh@users.noreply.github.com>
Signed-off-by: TomIO <tom@termux.dev>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index a327ba6c5d4b1076227fcf93ec11f4dd1e23544f..ffc2b04f5c990ed51ffb47db65ce7572d42f1622 100644 (file)
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1,4 +1,4 @@
-*builtin.txt*  For Vim version 9.2.  Last change: 2026 Mar 15
+*builtin.txt*  For Vim version 9.2.  Last change: 2026 Mar 17
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -13115,6 +13115,7 @@ acl                     Compiled with |ACL| support.
 all_builtin_terms      Compiled with all builtin terminals enabled. (always
                        true)
 amiga                  Amiga version of Vim.
+android                        Android version of Vim. *android*
 arabic                 Compiled with Arabic support |Arabic|.
 arp                    Compiled with ARP support (Amiga).
 autocmd                        Compiled with autocommand support. (always true)
@@ -13285,6 +13286,7 @@ termguicolors           Compiled with true color in terminal support.
 terminal               Compiled with |terminal| support.
 terminfo               Compiled with terminfo instead of termcap.
 termresponse           Compiled with support for |t_RV| and |v:termresponse|.
+termux                 Termux version of Vim. *termux*
 textobjects            Compiled with support for |text-objects|.
 textprop               Compiled with support for |text-properties|.
 tgetent                        Compiled with tgetent support, able to use a termcap

diff --git a/runtime/doc/tags b/runtime/doc/tags
index f5950e085e43390693f8e832b6ebbb5acf025a5f..5117c07efcb3678779c96a2394b6014f38f9b713 100644 (file)
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -6231,6 +6231,7 @@ alt-input debugger.txt    /*alt-input*
 alternate-file editing.txt     /*alternate-file*
 amiga-window   starting.txt    /*amiga-window*
 and()  builtin.txt     /*and()*
+android        builtin.txt     /*android*
 anonymous-function     eval.txt        /*anonymous-function*
 ant.vim        syntax.txt      /*ant.vim*
 ap     motion.txt      /*ap*
@@ -11083,6 +11084,7 @@ termresponse-variable   eval.txt        /*termresponse-variable*
 termrfgresp-variable   eval.txt        /*termrfgresp-variable*
 termstyleresp-variable eval.txt        /*termstyleresp-variable*
 termu7resp-variable    eval.txt        /*termu7resp-variable*
+termux builtin.txt     /*termux*
 ternary        eval.txt        /*ternary*
 test-functions usr_41.txt      /*test-functions*
 test-functions-details testing.txt     /*test-functions-details*

diff --git a/src/evalfunc.c b/src/evalfunc.c
index f790aa826a7b8db68a972c9af9a419348fa716d2..d9f0017e680bd148338f3330efaad856294bae7d 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -6678,6 +6678,13 @@ f_has(typval_T *argvars, typval_T *rettv)
                1
 #else
                0
+#endif
+               },
+       {"android",
+#ifdef __ANDROID__
+               1
+#else
+               0
 #endif
                },
        {"arp",
@@ -6762,6 +6769,13 @@ f_has(typval_T *argvars, typval_T *rettv)
                1
 #else
                0
+#endif
+               },
+       {"termux",
+#ifdef __TERMUX__
+               1
+#else
+               0
 #endif
                },
        {"unix",

diff --git a/src/version.c b/src/version.c
index c480833be6bc69d38960f93c87b142100b847eef..b2257997cbc7ec2b14820dfafb5c6c133acdd9a1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    191,
 /**/
     190,
 /**/