diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2022-09-18 03:17:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-18 09:17:15 +0800 |
| commit | 6d557e324fd4223fff3279a0112f40431c540163 (patch) | |
| tree | 74b9d80ccfe5bb6ac628a3455aa1f2c6c3b20497 /src/nvim/tui | |
| parent | 3c3f3e7353ba2cb9071183cd05036ca2a98d3672 (diff) | |
| download | rneovim-6d557e324fd4223fff3279a0112f40431c540163.tar.gz rneovim-6d557e324fd4223fff3279a0112f40431c540163.tar.bz2 rneovim-6d557e324fd4223fff3279a0112f40431c540163.zip | |
vim-patch:8.1.0941: macros for MS-Windows are inconsistent (#20215)
Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and
others.
Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the
GUI build. (Hirohito Higashi, closes vim/vim#3932)
https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9
Diffstat (limited to 'src/nvim/tui')
| -rw-r--r-- | src/nvim/tui/input.c | 4 | ||||
| -rw-r--r-- | src/nvim/tui/tui.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c index 728520c20c..998e8cfed0 100644 --- a/src/nvim/tui/input.c +++ b/src/nvim/tui/input.c @@ -15,7 +15,7 @@ #include "nvim/tui/input.h" #include "nvim/tui/tui.h" #include "nvim/vim.h" -#ifdef WIN32 +#ifdef MSWIN # include "nvim/os/os_win_console.h" #endif #include "nvim/event/rstream.h" @@ -143,7 +143,7 @@ void tinput_init(TermInput *input, Loop *loop) // If stdin is not a pty, switch to stderr. For cases like: // echo q | nvim -es // ls *.md | xargs nvim -#ifdef WIN32 +#ifdef MSWIN if (!os_isatty(input->in_fd)) { input->in_fd = os_get_conin_fd(); } diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 73f47f2b71..fd92873508 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -31,7 +31,7 @@ #include "nvim/os/tty.h" #include "nvim/ui.h" #include "nvim/vim.h" -#ifdef WIN32 +#ifdef MSWIN # include "nvim/os/os_win_console.h" #endif #include "nvim/cursor_shape.h" @@ -263,7 +263,7 @@ static void terminfo_start(UI *ui) data->input.tui_data = data; const char *term = os_getenv("TERM"); -#ifdef WIN32 +#ifdef MSWIN os_tty_guess_term(&term, data->out_fd); os_setenv("TERM", term, 1); // Old os_getenv() pointer is invalid after os_setenv(), fetch it again. @@ -353,7 +353,7 @@ static void terminfo_start(UI *ui) if (ret) { ELOG("uv_tty_init failed: %s", uv_strerror(ret)); } -#ifdef WIN32 +#ifdef MSWIN ret = uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_RAW); if (ret) { ELOG("uv_tty_set_mode failed: %s", uv_strerror(ret)); @@ -1810,7 +1810,7 @@ static void patch_terminfo_bugs(TUIData *data, const char *term, const char *col } } -#ifdef WIN32 +#ifdef MSWIN // XXX: workaround libuv implicit LF => CRLF conversion. #10558 unibi_set_str(ut, unibi_cursor_down, "\x1b[B"); #endif |