Merge from trunk, configury not fixed yet.

2 files changed, 6 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2089a50d47b..bd7618e0a82 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * make-docfile.c (search_lisp_doc_at_eol) [DEBUG]: Fix typo,
+        by removing references to no-longer-existing locals.
+
 2013-03-26  Eli Zaretskii  <eliz@gnu.org>
 
         Fix incompatibilities between MinGW.org and MinGW64 headers.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 68e5279fd15..8fa70dd430e 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1090,8 +1090,7 @@ search_lisp_doc_at_eol (FILE *infile)
   if (c2 != '"' || c1 != '\\')
     {
 #ifdef DEBUG
-      fprintf (stderr, "## non-docstring in %s (%s)\n",
-               buffer, filename);
+      fprintf (stderr, "## non-docstring found\n");
 #endif
       if (c != EOF)
         ungetc (c, infile);