IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

cleanup/TUI: remove old unused code #9013

Browse Source 
- Checks for ECHOE, ICANON were left over from Vim code. We already
  reference the symbols elsewhere without checking.
- newline_on_exit, intr_char: Both are vestigial remnants of Vim 4.x,
  not implemented in Nvim. intr_char is a termios/stty feature, it's
  probably not useful because users have other ways to configure their
  terminals.
This commit is contained in:
Justin M. Keyes 2018-09-19 07:59:09 +02:00 committed by GitHub
parent d0401e827b
commit 8b60253ce7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/ex_cmds.c
View File

@ -3632,12 +3632,8 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout,
} }
} }
need_wait_return = FALSE; /* no hit-return prompt */ need_wait_return = false; // no hit-return prompt
if (typed == 'q' || typed == ESC || typed == Ctrl_C if (typed == 'q' || typed == ESC || typed == Ctrl_C) {
#ifdef UNIX
|| typed == intr_char
#endif
) {
got_quit = true; got_quit = true;
break; break;
} }

3
src/nvim/ex_getln.c
View File

@ -3354,9 +3354,6 @@ void cmdline_paste_str(char_u *s, int literally)
} }
if (cv == Ctrl_V || c == ESC || c == Ctrl_C if (cv == Ctrl_V || c == ESC || c == Ctrl_C
|| c == CAR || c == NL || c == Ctrl_L || c == CAR || c == NL || c == Ctrl_L
#ifdef UNIX
|| c == intr_char
#endif
|| (c == Ctrl_BSL && *s == Ctrl_N)) { || (c == Ctrl_BSL && *s == Ctrl_N)) {
stuffcharReadbuff(Ctrl_V); stuffcharReadbuff(Ctrl_V);
} }

10
src/nvim/globals.h
View File

@ -280,13 +280,9 @@ EXTERN int did_wait_return INIT(= FALSE); /* wait_return() was used and
nothing written since then */ nothing written since then */
EXTERN int need_maketitle INIT(= TRUE); /* call maketitle() soon */ EXTERN int need_maketitle INIT(= TRUE); /* call maketitle() soon */
EXTERN int quit_more INIT(= FALSE); /* 'q' hit at "--more--" msg */ EXTERN int quit_more INIT(= false); // 'q' hit at "--more--" msg
#if defined(UNIX) || defined(MACOS_X) EXTERN int ex_keep_indent INIT(= false); // getexmodeline(): keep indent
EXTERN int newline_on_exit INIT(= FALSE); /* did msg in altern. screen */ EXTERN int vgetc_busy INIT(= 0); // when inside vgetc() then > 0
EXTERN int intr_char INIT(= 0); /* extra interrupt character */
#endif
EXTERN int ex_keep_indent INIT(= FALSE); /* getexmodeline(): keep indent */
EXTERN int vgetc_busy INIT(= 0); /* when inside vgetc() then > 0 */
EXTERN int didset_vim INIT(= FALSE); /* did set $VIM ourselves */ EXTERN int didset_vim INIT(= FALSE); /* did set $VIM ourselves */
EXTERN int didset_vimruntime INIT(= FALSE); /* idem for $VIMRUNTIME */ EXTERN int didset_vimruntime INIT(= FALSE); /* idem for $VIMRUNTIME */

4
src/nvim/misc1.c
View File

@ -2398,10 +2398,6 @@ int get_keystroke(void)
} }
buf[len >= buflen ? buflen - 1 : len] = NUL; buf[len >= buflen ? buflen - 1 : len] = NUL;
n = utf_ptr2char(buf); n = utf_ptr2char(buf);
#ifdef UNIX
if (n == intr_char)
n = ESC;
#endif
break; break;
} }
xfree(buf); xfree(buf);

2
src/nvim/tui/tui.c
View File

@ -1852,7 +1852,7 @@ static void flush_buf(UI *ui)
static const char *tui_get_stty_erase(void) static const char *tui_get_stty_erase(void)
{ {
static char stty_erase[2] = { 0 }; static char stty_erase[2] = { 0 };
#if defined(ECHOE) && defined(ICANON) && defined(HAVE_TERMIOS_H) #if defined(HAVE_TERMIOS_H)
struct termios t; struct termios t;
if (tcgetattr(input_global_fd(), &t) != -1) { if (tcgetattr(input_global_fd(), &t) != -1) {
stty_erase[0] = (char)t.c_cc[VERASE]; stty_erase[0] = (char)t.c_cc[VERASE];