updated for version 7.4.643
Problem: Using the default file format for Mac files. (Issue 77)
Solution: Reset the try_mac counter in the right place. (Oswald)
diff --git a/src/fileio.c b/src/fileio.c
index 1d16ee8..388446a 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2099,12 +2099,12 @@
/* First try finding a NL, for Dos and Unix */
if (try_dos || try_unix)
{
+ /* Reset the carriage return counter. */
+ if (try_mac)
+ try_mac = 1;
+
for (p = ptr; p < ptr + size; ++p)
{
- /* Reset the carriage return counter. */
- if (try_mac)
- try_mac = 1;
-
if (*p == NL)
{
if (!try_unix
diff --git a/src/testdir/test30.in b/src/testdir/test30.in
index 4a8778d..70bedc5 100644
--- a/src/testdir/test30.in
+++ b/src/testdir/test30.in
Binary files differ
diff --git a/src/testdir/test30.ok b/src/testdir/test30.ok
index 380ce67..b35f4f5 100644
--- a/src/testdir/test30.ok
+++ b/src/testdir/test30.ok
Binary files differ
diff --git a/src/version.c b/src/version.c
index d9e9192..e74b125 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 643,
+/**/
642,
/**/
641,