projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 2f43f8e6 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.040 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.040 | |
| 11 | Problem: When using ":e ++ff=dos fname" and the file contains a NL without | |
| 12 | a CR before it and 'ffs' contains "unix" then the fileformat | |
| 13 | becomes unix. | |
| 14 | Solution: Ignore 'ffs' when using the ++ff argument. (Ben Schmidt) | |
| 15 | Also remove unreachable code. | |
| 16 | Files: src/fileio.c | |
| 17 | ||
| 18 | ||
| 19 | *** ../vim-7.2.039/src/fileio.c Tue Nov 11 21:55:29 2008 | |
| 20 | --- src/fileio.c Wed Nov 12 13:19:42 2008 | |
| 21 | *************** | |
| 22 | *** 932,938 **** | |
| 23 | --- 932,941 ---- | |
| 24 | else | |
| 25 | { | |
| 26 | if (eap != NULL && eap->force_ff != 0) | |
| 27 | + { | |
| 28 | fileformat = get_fileformat_force(curbuf, eap); | |
| 29 | + try_unix = try_dos = try_mac = FALSE; | |
| 30 | + } | |
| 31 | else if (curbuf->b_p_bin) | |
| 32 | fileformat = EOL_UNIX; /* binary: use Unix format */ | |
| 33 | else if (*p_ffs == NUL) | |
| 34 | *************** | |
| 35 | *** 2341,2351 **** | |
| 36 | STRCAT(IObuff, _("[CR missing]")); | |
| 37 | c = TRUE; | |
| 38 | } | |
| 39 | - if (ff_error == EOL_MAC) | |
| 40 | - { | |
| 41 | - STRCAT(IObuff, _("[NL found]")); | |
| 42 | - c = TRUE; | |
| 43 | - } | |
| 44 | if (split) | |
| 45 | { | |
| 46 | STRCAT(IObuff, _("[long lines split]")); | |
| 47 | --- 2344,2349 ---- | |
| 48 | *** ../vim-7.2.039/src/version.c Wed Nov 12 15:28:37 2008 | |
| 49 | --- src/version.c Wed Nov 12 16:03:44 2008 | |
| 50 | *************** | |
| 51 | *** 678,679 **** | |
| 52 | --- 678,681 ---- | |
| 53 | { /* Add new patch number below this line */ | |
| 54 | + /**/ | |
| 55 | + 40, | |
| 56 | /**/ | |
| 57 | ||
| 58 | -- | |
| 59 | If you're sending someone Styrofoam, what do you pack it in? | |
| 60 | ||
| 61 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 62 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 63 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 64 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |