branch master updated: * tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi): remove redundant conditions.

[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 a7a50ae7f0 * tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi): 
remove redundant conditions.
a7a50ae7f0 is described below

commit a7a50ae7f051e0e65e906547f2a8f14fa61279fd
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 18 00:26:51 2022 +0100

    * tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi): remove
    redundant conditions.
---
 ChangeLog                     | 5 +++++
 tp/Texinfo/Convert/Texinfo.pm | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 215e8a61ce..dd0d9b410e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-11-17  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi): remove
+       redundant conditions.
+
 2022-11-17  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Texinfo.pm,
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 94e22bcd29..6e0d4d175a 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -177,9 +177,8 @@ sub _expand_cmd_args_to_texi($;$) {
      foreach my $arg (@{$cmd->{'args'}}) {
         $result .= convert_to_texinfo($arg, $expand_replaced);
     }
-  # arg_line set for line_commands with type special
-  } elsif (($cmd->{'info'} or $cmdname eq 'macro' or $cmdname eq 'rmacro')
-           and defined($cmd->{'info'}->{'arg_line'})) {
+  # arg_line set for line_commands with type special and @macro
+  } elsif ($cmd->{'info'} and defined($cmd->{'info'}->{'arg_line'})) {
     $result .= $cmd->{'info'}->{'spaces_before_argument'}
       if $cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'};
     $result .= $cmd->{'info'}->{'arg_line'};