diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-08-11 21:58:20 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-08-11 21:58:20 +0200 |
commit | 097148e849136b49052b1b5123c714fb1d74db9b (patch) | |
tree | d5b0bf4ce9b435be94de3ff7b87e85ae99c1e484 /src/main.c | |
parent | 4301a729eabafee388aaf8465cf780d3f84cec95 (diff) |
patch 8.2.1422: the Mac GUI implementation is outdatedv8.2.1422
Problem: The Mac GUI implementation is outdated and probably doesn't even
work.
Solution: Remove the Mac GUI code. The MacVim project provides the
supported Vim GUI version.
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/src/main.c b/src/main.c index 86156b7281..c87fdbfb55 100644 --- a/src/main.c +++ b/src/main.c @@ -298,33 +298,6 @@ main params.want_full_screen = FALSE; #endif -#if defined(FEAT_GUI_MAC) && defined(MACOS_X_DARWIN) - // When the GUI is started from Finder, need to display messages in a - // message box. isatty(2) returns TRUE anyway, thus we need to check the - // name to know we're not started from a terminal. - if (gui.starting && (!isatty(2) || strcmp("/dev/console", ttyname(2)) == 0)) - { - params.want_full_screen = FALSE; - - // Avoid always using "/" as the current directory. Note that when - // started from Finder the arglist will be filled later in - // HandleODocAE() and "fname" will be NULL. - if (getcwd((char *)NameBuff, MAXPATHL) != NULL - && STRCMP(NameBuff, "/") == 0) - { - if (params.fname != NULL) - (void)vim_chdirfile(params.fname, "drop"); - else - { - expand_env((char_u *)"$HOME", NameBuff, MAXPATHL); - vim_chdir(NameBuff); - } - if (start_dir != NULL) - mch_dirname(start_dir, MAXPATHL); - } - } -#endif - /* * mch_init() sets up the terminal (window) for use. This must be * done after resetting full_screen, otherwise it may move the cursor. @@ -1843,18 +1816,6 @@ parse_command_name(mparm_T *parmp) initstr = gettail((char_u *)parmp->argv[0]); -#ifdef FEAT_GUI_MAC - // An issue has been seen when launching Vim in such a way that - // $PWD/$ARGV[0] or $ARGV[0] is not the absolute path to the - // executable or a symbolic link of it. Until this issue is resolved - // we prohibit the GUI from being used. - if (STRCMP(initstr, parmp->argv[0]) == 0) - disallow_gui = TRUE; - - // TODO: On MacOS X default to gui if argv[0] ends in: - // /Vim.app/Contents/MacOS/Vim -#endif - #ifdef FEAT_EVAL set_vim_var_string(VV_PROGNAME, initstr, -1); set_progpath((char_u *)parmp->argv[0]); |