From: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri, 8 Jun 2012 21:33:58 +0000 (+0200)
Subject: * make-docfile.c (search_lisp_doc_at_eol): Unget last read
X-Git-Tag: emacs-24.2.90~1199^2~474^2~81
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7cb70fd73eccd2725b8e436bff3295506816f935;p=emacs.git

* make-docfile.c (search_lisp_doc_at_eol): Unget last read
character.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index b6f5c3ead60..68a8c37c2fb 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* make-docfile.c (search_lisp_doc_at_eol): Unget last read
+	character.
+
 2012-06-06  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPTS, insrcdir)
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 1314a7b6829..4f68fdb78c9 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1025,7 +1025,7 @@ search_lisp_doc_at_eol (FILE *infile)
   char c = 0, c1 = 0, c2 = 0;
 
   /* Skip until the end of line; remember two previous chars.  */
-  while (c != '\n' && c != '\r' && c >= 0)
+  while (c != '\n' && c != '\r' && c != EOF)
     {
       c2 = c1;
       c1 = c;
@@ -1040,6 +1040,8 @@ search_lisp_doc_at_eol (FILE *infile)
       fprintf (stderr, "## non-docstring in %s (%s)\n",
 	       buffer, filename);
 #endif
+      if (c != EOF)
+	ungetc (c, infile);
       return 0;
     }
   return 1;