texinfo update (Thu Mar 31 12:22:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.483
retrieving revision 1.484
diff -c -r1.483 -r1.484
*** ChangeLog   27 Mar 2005 14:32:41 -0000      1.483
--- ChangeLog   31 Mar 2005 16:56:48 -0000      1.484
***************
*** 1,3 ****
--- 1,13 ----
+ 2005-03-31  ezra peisach <address@hidden>  (tiny change)
+ 
+       (bug-texinfo mail 30 Mar 2005 16:40:24 -0500.)
+       * defun.h (get_base_type): now takes an enum insertion_type.
+         defun.c (get_base_type): use enum instead of int internally.
+         (defun_internal): takes enum insertion_type instead of int and use
+                         enum internally.
+        (cm_defun): ditto.
+       * insertion.c (do_enumeration, end_insertion, cm_end): ditto.
+ 
  2005-03-27  Karl Berry  <address@hidden>
  
        * util/texinfo.dtd: remove -- and ^L from inside comments, since
Index: makeinfo/defun.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/defun.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** makeinfo/defun.c    11 Apr 2004 17:56:46 -0000      1.11
--- makeinfo/defun.c    31 Mar 2005 16:56:48 -0000      1.12
***************
*** 1,5 ****
  /* defun.c -- @defun and friends.
!    $Id: defun.c,v 1.11 2004/04/11 17:56:46 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* defun.c -- @defun and friends.
!    $Id: defun.c,v 1.12 2005/03/31 16:56:48 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
***************
*** 299,307 ****
  /* This is needed also in insertion.c.  */
  
  enum insertion_type
! get_base_type (int type)
  {
!   int base_type;
    switch (type)
      {
      case defivar:     base_type = defcv; break;
--- 299,307 ----
  /* This is needed also in insertion.c.  */
  
  enum insertion_type
! get_base_type (enum insertion_type type)
  {
!   enum insertion_type base_type;
    switch (type)
      {
      case defivar:     base_type = defcv; break;
***************
*** 329,337 ****
     TYPE says which insertion this is.
     X_P, if nonzero, says not to start a new insertion. */
  static void
! defun_internal (int type, int x_p)
  {
!   int base_type;
    char **defun_args, **scan_args;
    const char *category;
    char *defined_name;
--- 329,337 ----
     TYPE says which insertion this is.
     X_P, if nonzero, says not to start a new insertion. */
  static void
! defun_internal (enum insertion_type type, int x_p)
  {
!   enum insertion_type base_type;
    char **defun_args, **scan_args;
    const char *category;
    char *defined_name;
***************
*** 688,694 ****
  void
  cm_defun (void)
  {
!   int type;
    char *base_command = xstrdup (command);  /* command with any `x' removed */
    int x_p = (command[strlen (command) - 1] == 'x');
  
--- 688,694 ----
  void
  cm_defun (void)
  {
!   enum insertion_type type;
    char *base_command = xstrdup (command);  /* command with any `x' removed */
    int x_p = (command[strlen (command) - 1] == 'x');
  
Index: makeinfo/defun.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/defun.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** makeinfo/defun.h    11 Apr 2004 17:56:47 -0000      1.2
--- makeinfo/defun.h    31 Mar 2005 16:56:48 -0000      1.3
***************
*** 1,7 ****
  /* defun.h -- declaration for defuns.
!    $Id: defun.h,v 1.2 2004/04/11 17:56:47 karl Exp $
  
!    Copyright (C) 1999 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,7 ----
  /* defun.h -- declaration for defuns.
!    $Id: defun.h,v 1.3 2005/03/31 16:56:48 karl Exp $
  
!    Copyright (C) 1999, 2005 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 24,30 ****
  
  #include "insertion.h"
  
! extern enum insertion_type get_base_type (int type);
  extern void cm_defun (void);
  
  #endif /* !DEFUN_H */
--- 24,30 ----
  
  #include "insertion.h"
  
! extern enum insertion_type get_base_type (enum insertion_type);
  extern void cm_defun (void);
  
  #endif /* !DEFUN_H */
Index: makeinfo/insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -c -r1.56 -r1.57
*** makeinfo/insertion.c        17 Jan 2005 00:25:15 -0000      1.56
--- makeinfo/insertion.c        31 Mar 2005 16:56:48 -0000      1.57
***************
*** 1,5 ****
  /* insertion.c -- insertions for Texinfo.
!    $Id: insertion.c,v 1.56 2005/01/17 00:25:15 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
     Software Foundation, Inc.
--- 1,5 ----
  /* insertion.c -- insertions for Texinfo.
!    $Id: insertion.c,v 1.57 2005/03/31 16:56:48 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
     Software Foundation, Inc.
***************
*** 955,963 ****
     of the stack.  Otherwise, if TYPE doesn't match the top of the
     insertion stack, give error. */
  static void
! end_insertion (int type)
  {
!   int temp_type;
  
    if (!insertion_level)
      return;
--- 955,963 ----
     of the stack.  Otherwise, if TYPE doesn't match the top of the
     insertion stack, give error. */
  static void
! end_insertion (enum insertion_type type)
  {
!   enum insertion_type temp_type;
  
    if (!insertion_level)
      return;
***************
*** 1576,1582 ****
  /* Start an enumeration insertion of type TYPE.  If the user supplied
     no argument on the line, then use DEFAULT_STRING as the initial string. */
  static void
! do_enumeration (int type, char *default_string)
  {
    get_until_in_line (0, ".", &enumeration_arg);
    canon_white (enumeration_arg);
--- 1576,1582 ----
  /* Start an enumeration insertion of type TYPE.  If the user supplied
     no argument on the line, then use DEFAULT_STRING as the initial string. */
  static void
! do_enumeration (enum insertion_type type, char *default_string)
  {
    get_until_in_line (0, ".", &enumeration_arg);
    canon_white (enumeration_arg);
***************
*** 2050,2056 ****
  cm_end (void)
  {
    char *temp;
!   int type;
  
    get_rest_of_line (0, &temp);
  
--- 2050,2056 ----
  cm_end (void)
  {
    char *temp;
!   enum insertion_type type;
  
    get_rest_of_line (0, &temp);
  
P ChangeLog
P makeinfo/defun.c
P makeinfo/defun.h
P makeinfo/insertion.c