branch master updated: Substitute Perl formatting function for button only for Perl with cv_name

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new f9124f316a Substitute Perl formatting function for button only for 
Perl with cv_name
f9124f316a is described below

commit f9124f316a768b2702edbcc190cbace7e5d03a77
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Jun 6 18:06:49 2024 +0200

    Substitute Perl formatting function for button only for Perl with cv_name
    
    * tp/Texinfo/XS/main/get_perl_info.c
    (html_get_button_specification_list): replace the Perl formatting
    function for button by a C formatting function for default formatting
    functions only if the PErl version has cv_name.  Based on ppport.h
    output, use 5.21.5 as minimum Perl version.  Based on Gavin
    investigations.
---
 ChangeLog                          | 11 +++++++++++
 tp/Texinfo/XS/main/get_perl_info.c |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2e4c46450f..bc52b98429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-06-06  Patrice Dumas  <pertusus@free.fr>
+
+       Substitute Perl formatting function for button only for Perl with 
cv_name
+
+       * tp/Texinfo/XS/main/get_perl_info.c
+       (html_get_button_specification_list): replace the Perl formatting
+       function for button by a C formatting function for default formatting
+       functions only if the PErl version has cv_name.  Based on ppport.h
+       output, use 5.21.5 as minimum Perl version.  Based on Gavin
+       investigations.
+
 2024-06-06  Patrice Dumas  <pertusus@free.fr>
 
        Do not use unnamed union for INDEX_COLLATOR
diff --git a/tp/Texinfo/XS/main/get_perl_info.c 
b/tp/Texinfo/XS/main/get_perl_info.c
index 028fb629df..09d8fc3165 100644
--- a/tp/Texinfo/XS/main/get_perl_info.c
+++ b/tp/Texinfo/XS/main/get_perl_info.c
@@ -1150,6 +1150,8 @@ html_get_button_specification_list (const CONVERTER 
*converter,
                       button_spec->type = BIT_function;
                       button_spec->bi.button_function.sv_reference
                                           = *button_spec_info_type;
+  /* based on ppport.h output cv_name may not be portable below perl 5.21.5 */
+#if PERL_VERSION > 21 || (PERL_VERSION == 21 && PERL_SUBVERSION > 4)
                       button_fun_name
                        = SvPV_nolen (cv_name ((CV *) SvRV 
(*button_spec_info_type),
                                               0, 0));
@@ -1160,6 +1162,7 @@ html_get_button_specification_list (const CONVERTER 
*converter,
                             button_fun_type = j;
                             break;
                           }
+#endif
                       if (button_fun_type)
                         button_spec->bi.button_function.type = button_fun_type;
                       else