Mercurial > vim
diff src/message.c @ 12716:351cf7c67bbe v8.0.1236
patch 8.0.1236: Mac features are confusing
commit https://github.com/vim/vim/commit/d057301b1f28736f094affa17b190244ad56e8d9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Oct 28 21:11:06 2017 +0200
patch 8.0.1236: Mac features are confusing
Problem: Mac features are confusing.
Solution: Make feature names more consistent, add "osxdarwin". Rename
feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 28 Oct 2017 21:15:35 +0200 |
| parents | e769c912fcd9 |
| children | ebb4f6c93598 |
line wrap: on
line diff
--- a/src/message.c +++ b/src/message.c @@ -2660,11 +2660,10 @@ msg_puts_printf(char_u *str, int maxlen) if (!(silent_mode && p_verbose == 0)) { /* NL --> CR NL translation (for Unix, not for "--version") */ - /* NL --> CR translation (for Mac) */ p = &buf[0]; if (*s == '\n' && !info_message) *p++ = '\r'; -#if defined(USE_CR) && !defined(MACOS_X_UNIX) +#if defined(USE_CR) else #endif *p++ = *s; @@ -3005,7 +3004,7 @@ mch_errmsg(char *str) * On Mac, when started from Finder, stderr is the console. */ if ( # ifdef UNIX -# ifdef MACOS_X_UNIX +# ifdef MACOS_X (isatty(2) && strcmp("/dev/console", ttyname(2)) != 0) # else isatty(2) @@ -3072,7 +3071,7 @@ mch_msg(char *str) * On Mac, when started from Finder, stderr is the console. */ if ( # ifdef UNIX -# ifdef MACOS_X_UNIX +# ifdef MACOS_X (isatty(2) && strcmp("/dev/console", ttyname(2)) != 0) # else isatty(2)