6 files changed, 16 insertions, 4 deletions
diff --git a/Build/source/texk/bibtex8/ChangeLog b/Build/source/texk/bibtex8/ChangeLog
index ef69271851f..1554111be8a 100644
--- a/Build/source/texk/bibtex8/ChangeLog
+++ b/Build/source/texk/bibtex8/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* bibtex.c (eoln): Accept both CR and LF as end-of-line.
+
 2011-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf.
diff --git a/Build/source/texk/bibtex8/bibtex.c b/Build/source/texk/bibtex8/bibtex.c
index 204083b3888..6d0c596fac6 100644
--- a/Build/source/texk/bibtex8/bibtex.c
+++ b/Build/source/texk/bibtex8/bibtex.c
@@ -190,7 +190,7 @@ BEGIN
   BEGIN
     (void) ungetc (c, file_pointer);
   END
-  if (c == '\n' || c == EOF)
+  if (c == '\n' || c == '\r' || c == EOF)
   BEGIN
     return (TRUE);
   END
diff --git a/Build/source/texk/bibtexu/ChangeLog b/Build/source/texk/bibtexu/ChangeLog
index 973198d78da..65252938e0e 100644
--- a/Build/source/texk/bibtexu/ChangeLog
+++ b/Build/source/texk/bibtexu/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* bibtex.c (eoln): Accept both CR and LF as end-of-line.
+
 2011-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf.
diff --git a/Build/source/texk/bibtexu/bibtex.c b/Build/source/texk/bibtexu/bibtex.c
index 7fb13f7b358..f540f7aa77e 100644
--- a/Build/source/texk/bibtexu/bibtex.c
+++ b/Build/source/texk/bibtexu/bibtex.c
@@ -199,7 +199,7 @@ BEGIN
   BEGIN
     (void) ungetc (c, file_pointer);
   END
-  if (c == '\n' || c == EOF)
+  if (c == '\n' || c == '\r' || c == EOF)
   BEGIN
     return (TRUE);
   END
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index c06e1fe7651..4eee4d5d44b 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* eofeoln.c (eof): Fix a typo in comment.
+
 2012-01-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* printversion.c, texmfmp.c: Drop report of file offset bits.
diff --git a/Build/source/texk/web2c/lib/eofeoln.c b/Build/source/texk/web2c/lib/eofeoln.c
index 457bbfca41c..1930df9051a 100644
--- a/Build/source/texk/web2c/lib/eofeoln.c
+++ b/Build/source/texk/web2c/lib/eofeoln.c
@@ -12,8 +12,8 @@ eof (FILE *file)
 {
   register int c;
 
-  /* If FILE doesn't exist, return false. This happens when, for
-     example, when a user does `mft foo.mf' -- there's no change file,
+  /* If FILE doesn't exist, return true. This happens, for example,
+     when a user does `mft foo.mf' -- there's no change file,
      so we never open it, so we end up calling this with a null pointer. */
   if (!file)
     return true;