diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-30 20:04:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-30 20:04:36 +0200 |
| commit | c958b316386fa44116a02bfbd5859edc54a4a7e0 (patch) | |
| tree | 666aac177fe9e0933eb59b45e8c80f698eaa7f62 | |
| parent | f52c38315669f85bbcf3bd74c590148bf588f6c6 (diff) | |
| download | vim-git-8.0.1166.tar.gz | |
patch 8.0.1166: :terminal doesn't work on Mac High Sierrav8.0.1166
Problem: :terminal doesn't work on Mac High Sierra.
Solution: Change #ifdef for OpenPTY(). (Ozaki Kiichi, Kazunobu Kuriyama,
closes #2162)
| -rw-r--r-- | src/pty.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -267,10 +267,11 @@ OpenPTY(char **ttyn) } #endif -#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) && !defined(MACOS_X) +#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) \ + && !(defined(MACOS_X) && !defined(MAC_OS_X_VERSION_10_6)) /* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work! - * Same for Mac OS X Leopard. */ + * Same for Mac OS X Leopard (10.5). */ #define PTY_DONE int OpenPTY(char **ttyn) diff --git a/src/version.c b/src/version.c index b28cd91a6..f02ebe0e5 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1166, +/**/ 1165, /**/ 1164, |