Changed comment version (6.0).

[bpt/emacs.git] / lib-src / make-docfile.c

diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 849ff25..df557e7 100644 (file)
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,5 +1,5 @@
 /* Generate doc-string file for GNU Emacs from source files.
 /* Generate doc-string file for GNU Emacs from source files.

-   Copyright (C) 1985, 1986, 92, 93, 94, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1985, 86, 92, 93, 94, 97, 1999 Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 
 This file is part of GNU Emacs.
 


@@ -72,10 +72,6 @@ int scan_c_file ();
 #include <unistd.h>
 #endif
 
 #include <unistd.h>
 #endif
 

-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#endif
-

 /* Stdio stream for output to the DOC file.  */
 FILE *outfile;
 
 /* Stdio stream for output to the DOC file.  */
 FILE *outfile;
 


@@ -530,6 +526,7 @@ scan_c_file (filename, mode)
  Looks for
   (defun NAME ARGS DOCSTRING ...)
   (defmacro NAME ARGS DOCSTRING ...)
  Looks for
   (defun NAME ARGS DOCSTRING ...)
   (defmacro NAME ARGS DOCSTRING ...)

+  (defsubst NAME ARGS DOCSTRING ...)

   (autoload (quote NAME) FILE DOCSTRING ...)
   (defvar NAME VALUE DOCSTRING)
   (defconst NAME VALUE DOCSTRING)
   (autoload (quote NAME) FILE DOCSTRING ...)
   (defvar NAME VALUE DOCSTRING)
   (defconst NAME VALUE DOCSTRING)


@@ -629,7 +626,7 @@ scan_lisp_file (filename, mode)
          continue;
        }
       /* Skip the line break.  */
          continue;
        }
       /* Skip the line break.  */

-      while (c == '\n' || c != '\r')
+      while (c == '\n' || c == '\r')

        c = getc (infile);
       /* Detect a dynamic doc string and save it for the next expression.  */
       if (c == '#')
        c = getc (infile);
       /* Detect a dynamic doc string and save it for the next expression.  */
       if (c == '#')


@@ -679,7 +676,8 @@ scan_lisp_file (filename, mode)
       read_lisp_symbol (infile, buffer);
 
       if (! strcmp (buffer, "defun")
       read_lisp_symbol (infile, buffer);
 
       if (! strcmp (buffer, "defun")

-         || ! strcmp (buffer, "defmacro"))
+         || ! strcmp (buffer, "defmacro")
+         || ! strcmp (buffer, "defsubst"))

        {
          type = 'F';
          read_lisp_symbol (infile, buffer);
        {
          type = 'F';
          read_lisp_symbol (infile, buffer);