branch master updated: * tp/Texinfo/Structuring.pm (index_entry_sort_string), tp/Texinfo/ParserNonXS.pm (_enter_index_entry): correct 'index_ignore_flags' as it should have been 'index_ignore_chars'.

[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 41d8d36  * tp/Texinfo/Structuring.pm (index_entry_sort_string), 
tp/Texinfo/ParserNonXS.pm (_enter_index_entry): correct 'index_ignore_flags' as 
it should have been 'index_ignore_chars'.
41d8d36 is described below

commit 41d8d36b58e93d4285ac26cae070d5ea785d3939
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Dec 24 18:15:38 2021 +0100

    * tp/Texinfo/Structuring.pm (index_entry_sort_string),
    tp/Texinfo/ParserNonXS.pm (_enter_index_entry):
    correct 'index_ignore_flags' as it should have been
    'index_ignore_chars'.
---
 ChangeLog                 | 7 +++++++
 tp/Texinfo/ParserNonXS.pm | 2 +-
 tp/Texinfo/Structuring.pm | 6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 42a0605..7e70946 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-12-24  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Structuring.pm (index_entry_sort_string),
+       tp/Texinfo/ParserNonXS.pm (_enter_index_entry):
+       correct 'index_ignore_flags' as it should have been
+       'index_ignore_chars'.
+
 2021-12-23  Gavin Smith  <gavinsmith0123@gmail.com>
 
        <code> for @t
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 9d1aab9..ef9a8de 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2553,7 +2553,7 @@ sub _enter_index_entry($$$$$$$)
     if (exists($self->{'values'}->{$set_variable})) {
       my $ignored_char = $set_flag_index_char_ignore{$set_variable};
       if (0) {
-      $index_entry->{'index_ignore_flags'}->{$ignored_char} = 1;
+      $index_entry->{'index_ignore_chars'}->{$ignored_char} = 1;
       }
     }
   }
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 29c5510..d45bec7 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1588,7 +1588,7 @@ sub setup_index_entry_keys_formatting($$)
   my $self = shift;
   my $configuration_informations = shift;
 
-  # TODO remove once 'index_ignore_flags' is implemented everywhere
+  # TODO remove once 'index_ignore_chars' is implemented everywhere
   my $ignore_chars = '';
 #if (0){
   # '-' must come first to avoid e.g. [<-@] looking like a character range
@@ -1627,9 +1627,9 @@ sub index_entry_sort_string($$$$;$)
     $entry_key = Texinfo::Convert::Text::convert_to_text(
                           $entry_tree_element, $convert_to_text_options);
     # FIXME do that for sortas too?
-    if (exists($main_entry->{'index_ignore_flags'})) {
+    if (exists($main_entry->{'index_ignore_chars'})) {
       $ignore_chars
-         .= quotemeta(join('', keys(%{$main_entry->{'index_ignore_flags'}})));
+         .= quotemeta(join('', keys(%{$main_entry->{'index_ignore_chars'}})));
     }
     if (defined($ignore_chars) and $ignore_chars ne '') {
       $entry_key =~ s/[$ignore_chars]//g;