diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-28 21:11:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-28 21:11:06 +0200 |
| commit | d057301b1f28736f094affa17b190244ad56e8d9 (patch) | |
| tree | ae20801354321a5ff0d7d23b04d8d6018c57645a /src/getchar.c | |
| parent | ef83956e1e67736b4c6b886d897b74f022622a74 (diff) | |
patch 8.0.1236: Mac features are confusingv8.0.1236
Problem: Mac features are confusing.
Solution: Make feature names more consistent, add "osxdarwin". Rename
feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
Diffstat (limited to 'src/getchar.c')
| -rw-r--r-- | src/getchar.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/getchar.c b/src/getchar.c index ef42d9c8cc..455c013884 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -1893,7 +1893,7 @@ char_avail(void) int retval; #ifdef FEAT_EVAL - /* When test_disable_char_avail(1) was called pretend there is no + /* When test_override("char_avail", 1) was called pretend there is no * typeahead. */ if (disable_char_avail_for_testing) return FALSE; @@ -5257,7 +5257,7 @@ check_map( } #endif -#if defined(MSWIN) || defined(MACOS) +#if defined(MSWIN) || defined(MACOS_X) #define VIS_SEL (VISUAL+SELECTMODE) /* abbreviation */ @@ -5308,7 +5308,7 @@ static struct initmap # endif #endif -#if defined(MACOS) +#if defined(MACOS_X) /* Use the Standard MacOS binding. */ /* paste, copy and cut */ {(char_u *)"<D-v> \"*P", NORMAL}, @@ -5329,7 +5329,7 @@ static struct initmap void init_mappings(void) { -#if defined(MSWIN) ||defined(MACOS) +#if defined(MSWIN) || defined(MACOS_X) int i; for (i = 0; i < (int)(sizeof(initmappings) / sizeof(struct initmap)); ++i) @@ -5337,7 +5337,8 @@ init_mappings(void) #endif } -#if defined(MSWIN) || defined(FEAT_CMDWIN) || defined(MACOS) || defined(PROTO) +#if defined(MSWIN) || defined(FEAT_CMDWIN) || defined(MACOS_X) \ + || defined(PROTO) /* * Add a mapping "map" for mode "mode". * Need to put string in allocated memory, because do_map() will modify it. |