To: vim_dev@googlegroups.com Subject: Patch 8.0.0751 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.0751 (after 8.0.0750) Problem: OpenPTY missing with some combination of features. (Kazunobu Kuriyama) Solution: Adjust #ifdef. Also include pty.pro when needed. Files: src/pty.c, src/misc2.c, src/proto.h *** ../vim-8.0.0750/src/pty.c 2017-07-22 20:53:11.356701739 +0200 --- src/pty.c 2017-07-22 20:56:25.515306535 +0200 *************** *** 43,49 **** #include "vim.h" ! #if defined(FEAT_GUI) || defined(FEAT_TERMINAL) #include --- 43,49 ---- #include "vim.h" ! #if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL) #include *** ../vim-8.0.0750/src/misc2.c 2017-06-22 22:37:53.588267735 +0200 --- src/misc2.c 2017-07-22 21:09:03.965858093 +0200 *************** *** 6050,6055 **** --- 6050,6058 ---- } # ifdef USE_VIMPTY_GETENV + /* + * Used for mch_getenv() for Mac. + */ char_u * vimpty_getenv(const char_u *string) { *** ../vim-8.0.0750/src/proto.h 2017-07-11 22:34:47.523932120 +0200 --- src/proto.h 2017-07-22 21:08:39.118035406 +0200 *************** *** 212,226 **** # include "channel.pro" # endif ! # ifdef FEAT_GUI ! # include "gui.pro" # if defined(UNIX) || defined(MACOS) # include "pty.pro" # endif # if !defined(HAVE_SETENV) && !defined(HAVE_PUTENV) && !defined(VMS) ! extern int putenv(const char *string); /* from pty.c */ # ifdef USE_VIMPTY_GETENV ! extern char_u *vimpty_getenv(const char_u *string); /* from pty.c */ # endif # endif # ifdef FEAT_GUI_W32 --- 212,229 ---- # include "channel.pro" # endif ! # if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL) # if defined(UNIX) || defined(MACOS) # include "pty.pro" # endif + # endif + + # ifdef FEAT_GUI + # include "gui.pro" # if !defined(HAVE_SETENV) && !defined(HAVE_PUTENV) && !defined(VMS) ! extern int putenv(const char *string); /* in misc2.c */ # ifdef USE_VIMPTY_GETENV ! extern char_u *vimpty_getenv(const char_u *string); /* in misc2.c */ # endif # endif # ifdef FEAT_GUI_W32 *** ../vim-8.0.0750/src/version.c 2017-07-22 20:53:11.356701739 +0200 --- src/version.c 2017-07-22 21:11:20.992880137 +0200 *************** *** 771,772 **** --- 771,774 ---- { /* Add new patch number below this line */ + /**/ + 751, /**/ -- hundred-and-one symptoms of being an internet addict: 211. Your husband leaves you...taking the computer with him and you call him crying, and beg him to bring the computer back. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///