aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/option.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/option.c')
-rw-r--r--src/nvim/option.c30
1 files changed, 5 insertions, 25 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 71d19e24f1..f026663ae5 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -4226,23 +4226,6 @@ did_set_string_option (
}
-
-
-#if defined(FEAT_MOUSE_TTY) && defined(UNIX)
- /* 'ttymouse' */
- else if (varp == &p_ttym) {
- /* Switch the mouse off before changing the escape sequences used for
- * that. */
- mch_setmouse(FALSE);
- if (opt_strings_flags(p_ttym, p_ttym_values, &ttym_flags, FALSE) != OK)
- errmsg = e_invarg;
- else
- check_mouse_termcode();
- if (termcap_active)
- setmouse(); /* may switch it on again */
- }
-#endif
-
/* 'selection' */
else if (varp == &p_sel) {
if (*p_sel == NUL
@@ -5439,8 +5422,7 @@ set_num_option (
curbuf->b_p_iminsert = B_IMODE_NONE;
}
p_iminsert = curbuf->b_p_iminsert;
- if (termcap_active) /* don't do this in the alternate screen */
- showmode();
+ showmode();
/* Show/unshow value of 'keymap' in status lines. */
status_redraw_curbuf();
} else if (pp == &p_window) {
@@ -5559,12 +5541,11 @@ set_num_option (
*/
if (old_Rows != Rows || old_Columns != Columns) {
/* Changing the screen size is not allowed while updating the screen. */
- if (updating_screen)
+ if (updating_screen) {
*pp = old_value;
- else if (full_screen
- )
- screen_resize((int)Columns, (int)Rows, TRUE);
- else {
+ } else if (full_screen) {
+ screen_resize((int)Columns, (int)Rows);
+ } else {
/* Postpone the resizing; check the size and cmdline position for
* messages. */
check_shellsize();
@@ -6414,7 +6395,6 @@ void clear_termoptions(void)
*/
mch_setmouse(FALSE); /* switch mouse off */
mch_restore_title(3); /* restore window titles */
- stoptermcap(); /* stop termcap mode */
free_termoptions();
}