Re: makeinfo 4.6 refuses positive ifset inside def*

[Karl Berry]

Hi Akim,

Regarding the failure of:

    @set bar
    @deffn foo
    @ifset bar
    @deffnx bar
    @end ifset

Thanks for the report.  Patch appended (and committed).

k

*** defun.c.~1.7.~      Fri Jun 20 10:29:08 2003
--- defun.c     Wed Aug 20 11:39:24 2003
***************
*** 730,744 ****
  
    /* If we are adding to an already existing insertion, then make sure
       that we are already in an insertion of type TYPE. */
!   if (x_p && (!insertion_level || insertion_stack->insertion != type))
      {
!       line_error (_("Must be in address@hidden' environment to use 
address@hidden'"),
!                   base_command, command);
!       discard_until ("\n");
!       return;
      }
-   else
-     defun_internal (type, x_p);
  
    free (base_command);
  }
--- 730,751 ----
  
    /* If we are adding to an already existing insertion, then make sure
       that we are already in an insertion of type TYPE. */
!   if (x_p)
      {
!       INSERTION_ELT *i = insertion_stack;
!       /* Skip over ifclear and ifset conditionals.  */
!       while (i && (i->insertion == ifset || i->insertion == ifclear))
!         i = i->next;
!         
!       if (!i || i->insertion != type)
!         {
!           line_error (_("Must be in address@hidden' environment to use 
address@hidden'"),
!                       base_command, command);
!           discard_until ("\n");
!           return;
!         }
      }
  
+   defun_internal (type, x_p);
    free (base_command);
  }