[no subject]

[Patrice Dumas]

branch: master
commit 7ebfdce672520d88c1da23d972ba1ce6021ea043
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Dec 12 16:01:39 2023 +0100

    * tp/Texinfo/Report.pm (format_line_message): only check if macro is
    defined.
---
 ChangeLog                 | 5 +++++
 tp/Texinfo/ParserNonXS.pm | 5 ++++-
 tp/Texinfo/Report.pm      | 3 +--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0468562936..9413e3a280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-12  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Report.pm (format_line_message): only check if macro is
+       defined.
+
 2023-12-12  Patrice Dumas  <pertusus@free.fr>
 
        No empty macro in source info
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index e4e3ba54af..50fe0ddce2 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -6781,7 +6781,10 @@ sub _process_remaining_on_line($$$$)
     #        and $current->{'contents'}->[-1]->{'type'}
     #        and $current->{'contents'}->[-1]->{'type'} eq 'empty_line'
     #        and $line ne '') {
-    #  print STDERR "New text in empty line 
$source_info->{'line_nr'}.$source_info->{'macro'} !$line!\n";
+    #  my $macro_name = '';
+    #  $macro_name = $source_info->{'macro'}
+    #                   if (defined($source_info->{'macro'}));
+    #  print STDERR "New text in empty line 
$source_info->{'line_nr'}.$macro_name !$line!\n";
     #}
   }
 
diff --git a/tp/Texinfo/Report.pm b/tp/Texinfo/Report.pm
index 00c24bdcbb..368aa6e766 100644
--- a/tp/Texinfo/Report.pm
+++ b/tp/Texinfo/Report.pm
@@ -93,8 +93,7 @@ sub format_line_message($$$$;$)
 
   my $message_line;
 
-  if (defined($error_location_info->{'macro'})
-      and $error_location_info->{'macro'} ne '') {
+  if (defined($error_location_info->{'macro'})) {
     if ($type eq 'warning') {
       # TODO change the context to "Texinfo source file warning in a macro"
       # when nearing the release