texinfo update (Sat Apr 23 09:22:01 EDT 2005)

[Karl Berry]

Index: makeinfo/xref.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xref.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** makeinfo/xref.c     5 Feb 2005 17:40:59 -0000       1.6
--- makeinfo/xref.c     23 Apr 2005 12:56:41 -0000      1.7
***************
*** 1,5 ****
  /* xref.c -- cross references for Texinfo.
!    $Id: xref.c,v 1.6 2005/02/05 17:40:59 karl Exp $
  
     Copyright (C) 2004 Free Software Foundation, Inc.
  
--- 1,5 ----
  /* xref.c -- cross references for Texinfo.
!    $Id: xref.c,v 1.7 2005/04/23 12:56:41 karl Exp $
  
     Copyright (C) 2004 Free Software Foundation, Inc.
  
***************
*** 574,583 ****
  
        if (xml && docbook)
          {
!           xml_insert_element_with_attribute (EMAIL, START, 
"url=\"mailto:%s\"";, addr);
!           if (*name)
                execute_string ("%s", name);
!           xml_insert_element (EMAIL, END);
          }
        else if (xml)
          {
--- 574,593 ----
  
        if (xml && docbook)
          {
!         if (*name)
!           {
!             xml_insert_element_with_attribute (EMAIL, START,
!                                                "url=\"mailto:%s\"";,
!                                                maybe_escaped_expansion (addr, 
0, 1));
                execute_string ("%s", name);
!             xml_insert_element (EMAIL, END);
!           }
!         else
!           {
!             xml_insert_element (EMAILADDRESS, START);
!             execute_string ("%s", addr);
!             xml_insert_element (EMAILADDRESS, END);
!           }
          }
        else if (xml)
          {
P makeinfo/xref.c