Fix typo.

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

diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 55920ce..84c0c9d 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.
-   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.
 
@@ -72,10 +72,6 @@ int scan_c_file ();
 #include <unistd.h>
 #endif
 
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#endif
-
 /* Stdio stream for output to the DOC file.  */
 FILE *outfile;
 
@@ -544,13 +540,16 @@ scan_c_file (filename, mode)
  When we find that, we save it for the following defining-form,
  and we use that instead of reading a doc string within that defining-form.
 
- For defun, defmacro, and autoload, we know how to skip over the arglist.
  For defvar, defconst, and fset we skip to the docstring with a kludgy 
  formatting convention: all docstrings must appear on the same line as the
  initial open-paren (the one in column zero) and must contain a backslash 
- and a double-quote immediately after the initial double-quote.  No newlines
+ and a newline immediately after the initial double-quote.  No newlines
  must appear between the beginning of the form and the first double-quote.
- The only source file that must follow this convention is loaddefs.el; aside
+ For defun, defmacro, and autoload, we know how to skip over the
+ arglist, but the doc string must still have a backslash and newline
+ immediately after the double quote. 
+ The only source files that must follow this convention are preloaded
+ uncompiled ones like loaddefs.el and bindings.el; aside
  from that, it is always the .elc file that we look at, and they are no
  problem because byte-compiler output follows this convention.
  The NAME and DOCSTRING are output.
@@ -619,12 +618,15 @@ scan_lisp_file (filename, mode)
       char buffer[BUFSIZ];
       char type;
 
+      /* If not at end of line, skip till we get to one.  */
       if (c != '\n' && c != '\r')
        {
          c = getc (infile);
          continue;
        }
-      c = getc (infile);
+      /* Skip the line break.  */
+      while (c == '\n' || c == '\r')
+       c = getc (infile);
       /* Detect a dynamic doc string and save it for the next expression.  */
       if (c == '#')
        {
@@ -657,8 +659,10 @@ scan_lisp_file (filename, mode)
                 That is needed in the .elc file
                 but it is redundant in DOC.  So get rid of it here.  */
              saved_string[length - 1] = 0;
-             /* Skip the newline.  */
-             c = getc (infile);
+             /* Skip the line break.  */
+             while (c == '\n' && c == '\r')
+               c = getc (infile);
+             /* Skip the following line.  */
              while (c != '\n' && c != '\r')
                c = getc (infile);
            }
@@ -670,8 +674,8 @@ scan_lisp_file (filename, mode)
 
       read_lisp_symbol (infile, buffer);
 
-      if (! strcmp (buffer, "defun") ||
-         ! strcmp (buffer, "defmacro"))
+      if (! strcmp (buffer, "defun")
+         || ! strcmp (buffer, "defmacro"))
        {
          type = 'F';
          read_lisp_symbol (infile, buffer);
@@ -681,8 +685,8 @@ scan_lisp_file (filename, mode)
          c = getc (infile);
          if (c == 'n') /* nil */
            {
-             if ((c = getc (infile)) != 'i' ||
-                 (c = getc (infile)) != 'l')
+             if ((c = getc (infile)) != 'i'
+                 || (c = getc (infile)) != 'l')
                {
                  fprintf (stderr, "## unparsable arglist in %s (%s)\n",
                           buffer, filename);
@@ -703,9 +707,9 @@ scan_lisp_file (filename, mode)
          /* If the next three characters aren't `dquote bslash newline'
             then we're not reading a docstring.
           */
-         if ((c = getc (infile)) != '"' ||
-             (c = getc (infile)) != '\\' ||
-             (c = getc (infile)) != '\n' || c != '\r')
+         if ((c = getc (infile)) != '"'
+             || (c = getc (infile)) != '\\'
+             || ((c = getc (infile)) != '\n' && c != '\r'))
            {
 #ifdef DEBUG
              fprintf (stderr, "## non-docstring in %s (%s)\n",
@@ -715,8 +719,8 @@ scan_lisp_file (filename, mode)
            }
        }
 
-      else if (! strcmp (buffer, "defvar") ||
-              ! strcmp (buffer, "defconst"))
+      else if (! strcmp (buffer, "defvar")
+              || ! strcmp (buffer, "defconst"))
        {
          char c1 = 0, c2 = 0;
          type = 'V';
@@ -725,7 +729,7 @@ scan_lisp_file (filename, mode)
          if (saved_string == 0)
            {
 
-             /* Skip until the first newline; remember the two previous chars. */
+             /* Skip until the end of line; remember two previous chars.  */
              while (c != '\n' && c != '\r' && c >= 0)
                {
                  c2 = c1;
@@ -784,8 +788,7 @@ scan_lisp_file (filename, mode)
 
          if (saved_string == 0)
            {
-             /* Skip until the first newline; remember the two previous
-                chars. */
+             /* Skip to end of line; remember the two previous chars.  */
              while (c != '\n' && c != '\r' && c >= 0)
                {
                  c2 = c1;
@@ -842,7 +845,7 @@ scan_lisp_file (filename, mode)
 
          if (saved_string == 0)
            {
-             /* Skip until the first newline; remember the two previous chars. */
+             /* Skip to end of line; remember the two previous chars.  */
              while (c != '\n' && c != '\r' && c >= 0)
                {
                  c2 = c1;
@@ -908,9 +911,9 @@ scan_lisp_file (filename, mode)
            {
              /* If the next three characters aren't `dquote bslash newline'
                 then we're not reading a docstring.  */
-             if ((c = getc (infile)) != '"' ||
-                 (c = getc (infile)) != '\\' ||
-                 (c = getc (infile)) != '\n' || c != '\r')
+             if ((c = getc (infile)) != '"'
+                 || (c = getc (infile)) != '\\'
+                 || ((c = getc (infile)) != '\n' && c != '\r'))
                {
 #ifdef DEBUG
                  fprintf (stderr, "## non-docstring in %s (%s)\n",
@@ -922,8 +925,8 @@ scan_lisp_file (filename, mode)
        }
 
 #ifdef DEBUG
-      else if (! strcmp (buffer, "if") ||
-              ! strcmp (buffer, "byte-code"))
+      else if (! strcmp (buffer, "if")
+              || ! strcmp (buffer, "byte-code"))
        ;
 #endif