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 1d16ee8dd180106f5c042256bb45836d24991a71..388446a482749a757f3dd45787ceef66260ad078 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2099,12 +2099,12 @@ rewind_retry:
                /* 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 4a8778d2deddb89d6820e71d3badbf1252c7d0d7..70bedc5039a92170fe1d36c7e445abf7405ae9f1 100644 (file)
--- a/src/testdir/test30.in
+++ b/src/testdir/test30.in
@@ -7,37 +7,33 @@ STARTTEST
 :" first write three test files, one in each format
 :set fileformat=unix
 :set fileformats=
-:/^1/w! XX1
-:/^2/w! XX2
-:/^3/w! XX3
-:/^4/w! XX4
-:/^5/w! XX5
-:/^6/w! XX6
-:/^7/w! XX7
-:/^8/w! XX8
-:/^9/w! XX9
-:/^10/w! XX10
 :/^unix/;/eof/-1w! XXUnix
 :/^dos/;/eof/-1w! XXDos
 :set bin noeol
 :$w! XXMac
+Gonoeol\e
+:$w! XXEol
 :set nobin eol
+:enew!
 :bwipe XXUnix XXDos XXMac
 :" create mixed format files
 :if has("vms")
 : !copy XXUnix,XXDos XXUxDs.
 : !copy XXUnix,XXMac XXUxMac.
 : !copy XXDos,XXMac  XXDosMac.
+: !copy XXMac,XXEol  XXMacEol.
 : !copy XXUnix,XXDos,XXMac XXUxDsMc.
 :elseif has("win32")
 : !copy /b XXUnix+XXDos XXUxDs
 : !copy /b XXUnix+XXMac XXUxMac
 : !copy /b XXDos+XXMac XXDosMac
+: !copy /b XXMac+XXEol XXMacEol
 : !copy /b XXUnix+XXDos+XXMac XXUxDsMc
 :else
 : !cat XXUnix XXDos >XXUxDs
 : !cat XXUnix XXMac >XXUxMac
 : !cat XXDos XXMac >XXDosMac
+: !cat XXMac XXEol >XXMacEol
 : !cat XXUnix XXDos XXMac >XXUxDsMc
 :endif
 :"
@@ -102,26 +98,48 @@ STARTTEST
 :e! XXDosMac
 :w! XXtt53
 :bwipe XXDosMac
+:e! XXEol
+ggO\12=&ffs
+:\12=&ff
+\e:w! XXtt54
+:bwipe XXEol
 :set fileformats=dos,mac
 :e! XXUxDs
 :w! XXtt61
 :bwipe XXUxDs
 :e! XXUxMac
-:w! XXtt62
+ggO\12=&ffs
+:\12=&ff
+\e:w! XXtt62
 :bwipe XXUxMac
 :e! XXUxDsMc
 :w! XXtt63
 :bwipe XXUxDsMc
+:e! XXMacEol
+ggO\12=&ffs
+:\12=&ff
+\e:w! XXtt64
+:bwipe XXMacEol
 :"
 :" try reading and writing with 'fileformats' set to three formats
 :set fileformats=unix,dos,mac
 :e! XXUxDsMc
 :w! XXtt71
 :bwipe XXUxDsMc
+:e! XXEol
+ggO\12=&ffs
+:\12=&ff
+\e:w! XXtt72
+:bwipe XXEol
 :set fileformats=mac,dos,unix
 :e! XXUxDsMc
 :w! XXtt81
 :bwipe XXUxDsMc
+:e! XXEol
+ggO\12=&ffs
+:\12=&ff
+\e:w! XXtt82
+:bwipe XXEol
 :" try with 'binary' set
 :set fileformats=mac,unix,dos
 :set binary
@@ -155,11 +173,15 @@ ggdGaEND\e:w >>XXtt01
 :w >>XXtt51
 :w >>XXtt52
 :w >>XXtt53
+:w >>XXtt54
 :w >>XXtt61
 :w >>XXtt62
 :w >>XXtt63
+:w >>XXtt64
 :w >>XXtt71
+:w >>XXtt72
 :w >>XXtt81
+:w >>XXtt82
 :w >>XXtt91
 :w >>XXtt92
 :w >>XXtt93
@@ -186,11 +208,15 @@ Go4\e:$r XXtt41
 Go5\e:$r XXtt51
 :$r XXtt52
 :$r XXtt53
+:$r XXtt54
 Go6\e:$r XXtt61
 :$r XXtt62
 :$r XXtt63
+:$r XXtt64
 Go7\e:$r XXtt71
+:$r XXtt72
 Go8\e:$r XXtt81
+:$r XXtt82
 Go9\e:$r XXtt91
 :$r XXtt92
 :$r XXtt93
@@ -200,17 +226,6 @@ Go10\e:$r XXUnix
 :qa!
 ENDTEST
 
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-
 unix
 unix
 eof

diff --git a/src/testdir/test30.ok b/src/testdir/test30.ok
index 380ce670613ec3f46d43cd1e646618a3bfb16143..b35f4f590419f48df6ad00da1ceb801e1d8dd0a7 100644 (file)
--- a/src/testdir/test30.ok
+++ b/src/testdir/test30.ok
@@ -70,12 +70,16 @@ END
 dos\r
 dos\r
 mac\rmac\rEND
+unix,mac:unix
+noeol
+END
 6
 unix\r
 unix\r
 dos\r
 dos\r
 END
+dos,mac:dos\r
 unix\r
 unix\r
 mac\rmac\r\r
@@ -86,6 +90,7 @@ dos
 dos\r
 mac\rmac\r\r
 END
+dos,mac:mac\rmac\rmac\rnoeol\rEND
 7
 unix
 unix
@@ -93,6 +98,9 @@ dos
 dos\r
 mac\rmac\r
 END
+unix,dos,mac:unix
+noeol
+END
 8
 unix
 unix
@@ -100,6 +108,7 @@ dos
 dos\r
 mac\rmac\r
 END
+mac,dos,unix:mac\rnoeol\rEND
 9
 unix
 unix

diff --git a/src/version.c b/src/version.c
index d9e9192827055faa7a974dc9d2bc437ab3845058..e74b125e055fe106428a3ce204897d8014f45fb4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    643,
 /**/
     642,
 /**/