Mercurial > vim

comparison src/fileio.c @ 1742:0e4fa55d20e0 v7.2.040

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.2-040
author vimboss
date Wed, 12 Nov 2008 15:05:21 +0000
parents 35abb7026415
children f10fe14748e2
comparison
equal deleted inserted replaced
1741:1bdb13b8e947 1742:0e4fa55d20e0
930 if (keep_fileformat) 930 if (keep_fileformat)
931 keep_fileformat = FALSE; 931 keep_fileformat = FALSE;
932 else 932 else
933 { 933 {
934 if (eap != NULL && eap->force_ff != 0) 934 if (eap != NULL && eap->force_ff != 0)
935 {
935 fileformat = get_fileformat_force(curbuf, eap); 936 fileformat = get_fileformat_force(curbuf, eap);
937 try_unix = try_dos = try_mac = FALSE;
938 }
936 else if (curbuf->b_p_bin) 939 else if (curbuf->b_p_bin)
937 fileformat = EOL_UNIX; /* binary: use Unix format */ 940 fileformat = EOL_UNIX; /* binary: use Unix format */
938 else if (*p_ffs == NUL) 941 else if (*p_ffs == NUL)
939 fileformat = get_fileformat(curbuf);/* use format from buffer */ 942 fileformat = get_fileformat(curbuf);/* use format from buffer */
940 else 943 else
2339 if (ff_error == EOL_DOS) 2342 if (ff_error == EOL_DOS)
2340 { 2343 {
2341 STRCAT(IObuff, _("[CR missing]")); 2344 STRCAT(IObuff, _("[CR missing]"));
2342 c = TRUE; 2345 c = TRUE;
2343 } 2346 }
2344 if (ff_error == EOL_MAC)
2345 {
2346 STRCAT(IObuff, _("[NL found]"));
2347 c = TRUE;
2348 }
2349 if (split) 2347 if (split)
2350 { 2348 {
2351 STRCAT(IObuff, _("[long lines split]")); 2349 STRCAT(IObuff, _("[long lines split]"));
2352 c = TRUE; 2350 c = TRUE;
2353 } 2351 }