branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert), tp/Texinfo/XS/convert/convert_html.c (set_special_units_targets_files): remove code that is never run found with solaris compiler.

[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 61ec99b4b1 * tp/Texinfo/Convert/HTML.pm (_convert), 
tp/Texinfo/XS/convert/convert_html.c (set_special_units_targets_files): remove 
code that is never run found with solaris compiler.
61ec99b4b1 is described below

commit 61ec99b4b1b71e4d13febfe6518ebdaa08b9fb66
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Jun 6 18:25:36 2024 +0200

    * tp/Texinfo/Convert/HTML.pm (_convert),
    tp/Texinfo/XS/convert/convert_html.c
    (set_special_units_targets_files): remove code that is never run
    found with solaris compiler.
    
    * tp/Texinfo/XS/convert/convert_html.c
    (set_special_units_targets_files): MONOLITHIC option is integer.
    Found with solaris compiler.
---
 ChangeLog                            | 11 +++++++++++
 tp/Texinfo/Convert/HTML.pm           |  3 ---
 tp/Texinfo/XS/convert/convert_html.c |  8 +-------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8e8d4a0a6..f32f1219dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-06-06  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (_convert),
+       tp/Texinfo/XS/convert/convert_html.c
+       (set_special_units_targets_files): remove code that is never run
+       found with solaris compiler.
+
+       * tp/Texinfo/XS/convert/convert_html.c
+       (set_special_units_targets_files): MONOLITHIC option is integer.
+       Found with solaris compiler.
+
 2024-06-06  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/call_html_perl_function.c: include ppport.h for
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 1fc835abe2..9a1b03bf12 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -13710,9 +13710,6 @@ sub _convert($$;$)
       }
       return '';
     }
-    if ($root_commands{$command_name}) {
-      delete $self->{'current_root_command'};
-    }
   } elsif ($element->{'type'}) {
 
     my $result = '';
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index a59fe513c1..43f7272494 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -1770,7 +1770,7 @@ set_special_units_targets_files (CONVERTER *self, const 
char *document_name)
         continue;
 
       if (((self->conf->SPLIT.o.string && strlen (self->conf->SPLIT.o.string))
-           || self->conf->MONOLITHIC.o.string <= 0)
+           || self->conf->MONOLITHIC.o.integer <= 0)
     /* in general document_name not defined means called through convert */
           && document_name)
         {
@@ -18458,12 +18458,6 @@ convert_to_html_internal (CONVERTER *self, const 
ELEMENT *element,
             }
           goto out;
         }
-
-      if (builtin_command_data[data_cmd].flags & CF_root)
-        {
-          self->current_root_command = 0;
-          self->modified_state |= HMSF_current_root;
-        }
     }
   else if (element->type)
     {