[Emacs-diffs] Changes to emacs/lib-src/make-docfile.c

[Pavel Janík]

Index: emacs/lib-src/make-docfile.c
diff -c emacs/lib-src/make-docfile.c:1.49 emacs/lib-src/make-docfile.c:1.50
*** emacs/lib-src/make-docfile.c:1.49   Thu Nov 15 10:50:31 2001
--- emacs/lib-src/make-docfile.c        Sat Jan  5 18:37:58 2002
***************
*** 363,369 ****
              if (c == 't')
                c = '\t';
            }
!         
          if (c == ' ')
            state.pending_spaces++;
          else if (c == '\n')
--- 363,369 ----
              if (c == 't')
                c = '\t';
            }
! 
          if (c == ' ')
            state.pending_spaces++;
          else if (c == '\n')
***************
*** 387,405 ****
              c = getc (infile);
              break;
            }
!         
          scan_keyword_or_put_char ('*', &state);
        }
        else
        {
          if (c != '"')
            break;
!       
          /* If we had a "", concatenate the two strings.  */
          c = getc (infile);
        }
      }
!   
    if (printflag < 0)
      *state.buf_ptr = 0;
  
--- 387,405 ----
              c = getc (infile);
              break;
            }
! 
          scan_keyword_or_put_char ('*', &state);
        }
        else
        {
          if (c != '"')
            break;
! 
          /* If we had a "", concatenate the two strings.  */
          c = getc (infile);
        }
      }
! 
    if (printflag < 0)
      *state.buf_ptr = 0;
  
***************
*** 644,653 ****
  
        while (c == ' ' || c == '\n' || c == '\r' || c == '\t')
        c = getc (infile);
!       
        if (c == '"')
        c = read_c_string_or_comment (infile, 0, 0, 0);
!       
        while (c != EOF && c != ',' && c != '/')
        c = getc (infile);
        if (c == ',')
--- 644,653 ----
  
        while (c == ' ' || c == '\n' || c == '\r' || c == '\t')
        c = getc (infile);
! 
        if (c == '"')
        c = read_c_string_or_comment (infile, 0, 0, 0);
! 
        while (c != EOF && c != ',' && c != '/')
        c = getc (infile);
        if (c == ',')
***************
*** 674,680 ****
        {
          int comment = c != '"';
          int saw_usage;
!         
          putc (037, outfile);
          putc (defvarflag ? 'V' : 'F', outfile);
          fprintf (outfile, "%s\n", buf);
--- 674,680 ----
        {
          int comment = c != '"';
          int saw_usage;
! 
          putc (037, outfile);
          putc (defvarflag ? 'V' : 'F', outfile);
          fprintf (outfile, "%s\n", buf);
***************
*** 704,710 ****
                      goto eof;
                    c = getc (infile);
                  }
!             
              /* Skip into arguments.  */
              while (c != '(')
                {
--- 704,710 ----
                      goto eof;
                    c = getc (infile);
                  }
! 
              /* Skip into arguments.  */
              while (c != '(')
                {
***************
*** 748,761 ****
   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 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 newline immediately after the initial double-quote.  No newlines
   must appear between the beginning of the form and the first double-quote.
   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
--- 748,761 ----
   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 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 newline immediately after the initial double-quote.  No newlines
   must appear between the beginning of the form and the first double-quote.
   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
***************
*** 801,807 ****
  
    if (! buffer[0])
      fprintf (stderr, "## expected a symbol, got '%c'\n", c);
!   
    skip_white (infile);
  }
  
--- 801,807 ----
  
    if (! buffer[0])
      fprintf (stderr, "## expected a symbol, got '%c'\n", c);
! 
    skip_white (infile);
  }
  
***************
*** 945,951 ****
                  c1 = c;
                  c = getc (infile);
                }
!         
              /* If two previous characters were " and \,
                 this is a doc string.  Otherwise, there is none.  */
              if (c2 != '"' || c1 != '\\')
--- 945,951 ----
                  c1 = c;
                  c = getc (infile);
                }
! 
              /* If two previous characters were " and \,
                 this is a doc string.  Otherwise, there is none.  */
              if (c2 != '"' || c1 != '\\')
***************
*** 1004,1010 ****
                  c1 = c;
                  c = getc (infile);
                }
!         
              /* If two previous characters were " and \,
                 this is a doc string.  Otherwise, there is none.  */
              if (c2 != '"' || c1 != '\\')
--- 1004,1010 ----
                  c1 = c;
                  c = getc (infile);
                }
! 
              /* If two previous characters were " and \,
                 this is a doc string.  Otherwise, there is none.  */
              if (c2 != '"' || c1 != '\\')
***************
*** 1061,1067 ****
                  c1 = c;
                  c = getc (infile);
                }
!         
              /* If two previous characters were " and \,
                 this is a doc string.  Otherwise, there is none.  */
              if (c2 != '"' || c1 != '\\')
--- 1061,1067 ----
                  c1 = c;
                  c = getc (infile);
                }
! 
              /* If two previous characters were " and \,
                 this is a doc string.  Otherwise, there is none.  */
              if (c2 != '"' || c1 != '\\')