Index: tree.c
===================================================================
RCS file: /cvs/gnome/gnome-xml/tree.c,v
retrieving revision 1.316
diff -c -r1.316 tree.c
*** tree.c	29 Jul 2004 07:07:16 -0000	1.316
--- tree.c	30 Jul 2004 11:03:46 -0000
***************
*** 73,88 ****
  
      switch(code) {
          case XML_TREE_INVALID_HEX:
! 	    msg = "invalid hexadecimal character value";
  	    break;
  	case XML_TREE_INVALID_DEC:
! 	    msg = "invalid decimal character value";
  	    break;
  	case XML_TREE_UNTERMINATED_ENTITY:
! 	    msg = "unterminated entity reference %15s";
  	    break;
  	default:
! 	    msg = "unexpected error number";
      }
      __xmlSimpleError(XML_FROM_TREE, code, node, msg, extra);
  }
--- 73,88 ----
  
      switch(code) {
          case XML_TREE_INVALID_HEX:
! 	    msg = "invalid hexadecimal character value\n";
  	    break;
  	case XML_TREE_INVALID_DEC:
! 	    msg = "invalid decimal character value\n";
  	    break;
  	case XML_TREE_UNTERMINATED_ENTITY:
! 	    msg = "unterminated entity reference %15s\n";
  	    break;
  	default:
! 	    msg = "unexpected error number\n";
      }
      __xmlSimpleError(XML_FROM_TREE, code, node, msg, extra);
  }
***************
*** 5781,5787 ****
  	/*
  	 * Browse the full subtree, deep first
  	 */
!         if (node->children != NULL) {
  	    /* deep first */
  	    node = node->children;
  	} else if ((node != tree) && (node->next != NULL)) {
--- 5781,5787 ----
  	/*
  	 * Browse the full subtree, deep first
  	 */
!         if (node->children != NULL && node->type != XML_ENTITY_REF_NODE) {
  	    /* deep first */
  	    node = node->children;
  	} else if ((node != tree) && (node->next != NULL)) {