diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-15 21:06:09 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-15 21:06:09 +0100 |
| commit | 00590740081489db69f43d9f1c0e3f70e29ce6da (patch) | |
| tree | 5200046e5c39885c50b5057cca9110975a629eb5 /src/option.h | |
| parent | e93e5a504f481bd0dad9c504d5fcf0e5f0dfc6e6 (diff) | |
patch 8.1.0927: USE_CR is never definedv8.1.0927
Problem: USE_CR is never defined.
Solution: Remove usage of USE_CR. (Ken Takata, closes #3958)
Diffstat (limited to 'src/option.h')
| -rw-r--r-- | src/option.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/option.h b/src/option.h index 26e5fd04c6..2f1d322bf1 100644 --- a/src/option.h +++ b/src/option.h @@ -50,21 +50,14 @@ # define DFLT_FFS_VI "dos,unix" /* also autodetect in compatible mode */ # define DFLT_TEXTAUTO TRUE #else -# ifdef USE_CR -# define DFLT_FF "mac" -# define DFLT_FFS_VIM "mac,unix,dos" -# define DFLT_FFS_VI "mac,unix,dos" -# define DFLT_TEXTAUTO TRUE +# define DFLT_FF "unix" +# define DFLT_FFS_VIM "unix,dos" +# ifdef __CYGWIN__ +# define DFLT_FFS_VI "unix,dos" /* Cygwin always needs file detection */ +# define DFLT_TEXTAUTO TRUE # else -# define DFLT_FF "unix" -# define DFLT_FFS_VIM "unix,dos" -# ifdef __CYGWIN__ -# define DFLT_FFS_VI "unix,dos" /* Cygwin always needs file detection */ -# define DFLT_TEXTAUTO TRUE -# else -# define DFLT_FFS_VI "" -# define DFLT_TEXTAUTO FALSE -# endif +# define DFLT_FFS_VI "" +# define DFLT_TEXTAUTO FALSE # endif #endif |