--- cvs-1.11.1p1/src/history.c	Thu Apr 19 14:45:32 2001
+++ cvs-1.11.1p1/fix/history.c	Tue Jan 29 12:57:05 2002
@@ -1055,7 +1055,7 @@
 read_hrecs (fname)
     char *fname;
 {
-    unsigned char *cpstart, *cpend, *cp, *nl;
+    unsigned char *cpstart, *cpend, *cp, *nl, *cr;
     char *hrline;
     int i;
     int fd;
@@ -1107,6 +1107,9 @@
 	    error (0, 0, "warning: no newline at end of history file");
 	}
 	*nl = '\0';
+	cr = nl;
+	while (cr-- > cp && *cr == '\r')
+	    *cr = '\0';
 
 	if (hrec_count == hrec_max)
 	{