Permalink
Browse files

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)
  • Loading branch information...
brammool committed Feb 27, 2015
1 parent d45c07a commit c6b7217ff502b8fc28d6c861d25c1943e30973ad
Showing with 52 additions and 26 deletions.
  1. +4 −4 src/fileio.c
  2. +37 −22 src/testdir/test30.in
  3. +9 −0 src/testdir/test30.ok
  4. +2 −0 src/version.c
View
@@ -2099,12 +2099,12 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
/* 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
View
@@ -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
:$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=&ffs
:=&ff
:w! XXtt54
:bwipe XXEol
:set fileformats=dos,mac
:e! XXUxDs
:w! XXtt61
:bwipe XXUxDs
:e! XXUxMac
:w! XXtt62
ggO=&ffs
:=&ff
:w! XXtt62
:bwipe XXUxMac
:e! XXUxDsMc
:w! XXtt63
:bwipe XXUxDsMc
:e! XXMacEol
ggO=&ffs
:=&ff
: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=&ffs
:=&ff
:w! XXtt72
:bwipe XXEol
:set fileformats=mac,dos,unix
:e! XXUxDsMc
:w! XXtt81
:bwipe XXUxDsMc
:e! XXEol
ggO=&ffs
:=&ff
:w! XXtt82
:bwipe XXEol
:" try with 'binary' set
:set fileformats=mac,unix,dos
:set binary
@@ -155,11 +173,15 @@ ggdGaEND: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:$r XXtt41
Go5:$r XXtt51
:$r XXtt52
:$r XXtt53
:$r XXtt54
Go6:$r XXtt61
:$r XXtt62
:$r XXtt63
:$r XXtt64
Go7:$r XXtt71
:$r XXtt72
Go8:$r XXtt81
:$r XXtt82
Go9:$r XXtt91
:$r XXtt92
:$r XXtt93
@@ -200,17 +226,6 @@ Go10:$r XXUnix
:qa!
ENDTEST
1
2
3
4
5
6
7
8
9
10
unix
unix
eof
View
@@ -70,12 +70,16 @@ END
dos
dos
macmacEND
unix,mac:unix
noeol
END
6
unix
unix
dos
dos
END
dos,mac:dos
unix
unix
macmac
@@ -86,20 +90,25 @@ dos
dos
macmac
END
dos,mac:macmacmacnoeolEND
7
unix
unix
dos
dos
macmac
END
unix,dos,mac:unix
noeol
END
8
unix
unix
dos
dos
macmac
END
mac,dos,unix:macnoeolEND
9
unix
unix
View
@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
643,
/**/
642,
/**/

0 comments on commit c6b7217

Please sign in to comment.