--- diffutils-2.8.1/src/context.c.lfnl	2005-04-08 17:55:38.545737844 -0400
+++ diffutils-2.8.1/src/context.c	2005-04-08 17:57:53.898588198 -0400
@@ -142,7 +142,7 @@
 {
   int i;
   putc (' ', out);
-  for (i = 0; i < 40 && function[i] != '\n'; i++)
+  for (i = 0; i < 40 && function[i] != '\n' && function[i] != '\r'; i++)
     continue;
   fwrite (function, 1, i, out);
 }