From 00cf632b2b0bfd5c3ced3ca15b34cae0b52cd06d Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Tue, 5 May 2015 22:00:43 -0400 Subject: Cleanup misc. Regarding debugger.txt (which was Spotted by @Hettomei): The third section was empty, and the second section is very outdated. Nvim doesn't have things like Balloon Evalutation and Sun Visual workshop integration, so just remove the section. Regarding everything else: - term.[ch] and term_defs.h don't exist anymore, so remove refs to them - Add ttybuiltin to vim_diff.txt. It should have been done before, but vim_diff.txt didn't exist when ttybuiltin was removed (done in 3baba1e7bc6698e6bc9f1d37fce88b30d6274bc9,) Helped-by: Justin M. Keyes --- src/nvim/keymap.h | 2 +- src/nvim/screen.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'src') diff --git a/src/nvim/keymap.h b/src/nvim/keymap.h index c82a95c00c..e6fcb4d1d2 100644 --- a/src/nvim/keymap.h +++ b/src/nvim/keymap.h @@ -16,7 +16,7 @@ /* * For MSDOS some keys produce codes larger than 0xff. They are split into two - * chars, the first one is K_NUL (same value used in term_defs.h). + * chars, the first one is K_NUL. */ #define K_NUL (0xce) /* for MSDOS: special key follows */ diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 8b47d090d4..4442e7bba6 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -6448,11 +6448,6 @@ int screen_ins_lines ( int j; unsigned temp; - // FAIL if - // - there is no valid screen - // - the screen has to be redrawn completely - // - the line count is less than one - // - the line count is more than 'ttyscroll' if (!screen_valid(TRUE) || line_count <= 0) { return FAIL; } @@ -6507,11 +6502,6 @@ int screen_del_lines ( int i; unsigned temp; - // FAIL if - // - there is no valid screen - // - the screen has to be redrawn completely - // - the line count is less than one - // - the line count is more than 'ttyscroll' if (!screen_valid(TRUE) || line_count <= 0) { return FAIL; } -- cgit From c50c831b85c9ca44cbc2857beaf8978bdcf99a7d Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Tue, 5 May 2015 22:00:43 -0400 Subject: Cleanup 'ttym[ouse]', FEAT_MOUSE, mouse_(dec|gpm|etc.) Because of 3baba1e7bc6698e6bc9f1d37fce88b30d6274bc9, it's dead code. Helped-by: Justin M. Keyes --- src/nvim/eval.c | 7 ------- src/nvim/keymap.c | 4 ---- src/nvim/keymap.h | 17 ----------------- src/nvim/option.c | 10 ---------- src/nvim/option_defs.h | 14 -------------- 5 files changed, 52 deletions(-) (limited to 'src') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index d309b908f1..e7cb830e67 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9965,13 +9965,6 @@ static void f_has(typval_T *argvars, typval_T *rettv) "mksession", "modify_fname", "mouse", -#if defined(UNIX) - "mouse_dec", - "mouse_netterm", - "mouse_sgr", - "mouse_urxvt", - "mouse_xterm", -#endif "multi_byte", "multi_lang", "path_extra", diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c index 8def1bb2ad..0c5c24184e 100644 --- a/src/nvim/keymap.c +++ b/src/nvim/keymap.c @@ -256,10 +256,6 @@ static struct key_name_entry { {'<', (char_u *)"lt"}, {K_MOUSE, (char_u *)"Mouse"}, - {K_NETTERM_MOUSE, (char_u *)"NetMouse"}, - {K_DEC_MOUSE, (char_u *)"DecMouse"}, - {K_URXVT_MOUSE, (char_u *)"UrxvtMouse"}, - {K_SGR_MOUSE, (char_u *)"SgrMouse"}, {K_LEFTMOUSE, (char_u *)"LeftMouse"}, {K_LEFTMOUSE_NM, (char_u *)"LeftMouseNM"}, {K_LEFTDRAG, (char_u *)"LeftDrag"}, diff --git a/src/nvim/keymap.h b/src/nvim/keymap.h index e6fcb4d1d2..022d27fda1 100644 --- a/src/nvim/keymap.h +++ b/src/nvim/keymap.h @@ -77,12 +77,6 @@ #define KS_VER_SCROLLBAR 249 #define KS_HOR_SCROLLBAR 248 -/* - * These are used for DEC mouse - */ -#define KS_NETTERM_MOUSE 247 -#define KS_DEC_MOUSE 246 - /* * Used for switching Select mode back on after a mapping or menu. */ @@ -103,12 +97,6 @@ /* Used for menu in a tab pages line. */ #define KS_TABMENU 239 -/* Used for the urxvt mouse. */ -#define KS_URXVT_MOUSE 238 - -/* Used for the sgr mouse. */ -#define KS_SGR_MOUSE 237 - /* * Filler used after KS_SPECIAL and others */ @@ -407,11 +395,6 @@ enum key_extra { #define K_VER_SCROLLBAR TERMCAP2KEY(KS_VER_SCROLLBAR, KE_FILLER) #define K_HOR_SCROLLBAR TERMCAP2KEY(KS_HOR_SCROLLBAR, KE_FILLER) -#define K_NETTERM_MOUSE TERMCAP2KEY(KS_NETTERM_MOUSE, KE_FILLER) -#define K_DEC_MOUSE TERMCAP2KEY(KS_DEC_MOUSE, KE_FILLER) -#define K_URXVT_MOUSE TERMCAP2KEY(KS_URXVT_MOUSE, KE_FILLER) -#define K_SGR_MOUSE TERMCAP2KEY(KS_SGR_MOUSE, KE_FILLER) - #define K_SELECT TERMCAP2KEY(KS_SELECT, KE_FILLER) #define K_TEAROFF TERMCAP2KEY(KS_TEAROFF, KE_FILLER) diff --git a/src/nvim/option.c b/src/nvim/option.c index 9357bb1947..bb6acc79dc 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1545,13 +1545,6 @@ static vimoption_T {"ttyfast", "tf", P_BOOL|P_NO_MKRC|P_VI_DEF, (char_u *)&p_force_on, PV_NONE, {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"ttymouse", "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF, -#if defined(FEAT_MOUSE) && defined(UNIX) - (char_u *)&p_ttym, PV_NONE, -#else - (char_u *)NULL, PV_NONE, -#endif - {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"undodir", "udir", P_STRING|P_EXPAND|P_COMMA|P_NODUP|P_SECURE|P_VI_DEF, (char_u *)&p_udir, PV_NONE, {(char_u *)".", (char_u *)0L} @@ -3245,9 +3238,6 @@ static void didset_options(void) (void)opt_strings_flags(p_fdo, p_fdo_values, &fdo_flags, TRUE); (void)opt_strings_flags(p_dy, p_dy_values, &dy_flags, TRUE); (void)opt_strings_flags(p_ve, p_ve_values, &ve_flags, TRUE); -#if defined(FEAT_MOUSE) && defined(UNIX) - (void)opt_strings_flags(p_ttym, p_ttym_values, &ttym_flags, FALSE); -#endif (void)spell_check_msm(); (void)spell_check_sps(); (void)compile_cap_prog(curwin->w_s); diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 96824fdccf..8776597cbb 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -565,20 +565,6 @@ EXTERN char_u *p_tsr; /* 'thesaurus' */ EXTERN int p_ttimeout; /* 'ttimeout' */ EXTERN long p_ttm; /* 'ttimeoutlen' */ EXTERN long p_ttyscroll; /* 'ttyscroll' */ -#if defined(FEAT_MOUSE) && defined(UNIX) -EXTERN char_u *p_ttym; /* 'ttymouse' */ -EXTERN unsigned ttym_flags; -# ifdef IN_OPTION_C -static char *(p_ttym_values[]) = -{"xterm", "xterm2", "dec", "netterm", "urxvt", "sgr", NULL}; -# endif -# define TTYM_XTERM 0x01 -# define TTYM_XTERM2 0x02 -# define TTYM_DEC 0x04 -# define TTYM_NETTERM 0x08 -# define TTYM_URXVT 0x20 -# define TTYM_SGR 0x40 -#endif EXTERN char_u *p_udir; /* 'undodir' */ EXTERN long p_ul; /* 'undolevels' */ EXTERN long p_ur; /* 'undoreload' */ -- cgit From 64cecd917d8b8b7a428e61f1f75d4a9c769450de Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Tue, 5 May 2015 22:00:43 -0400 Subject: Cleanup 'ttyscroll' remnants Removed in 3baba1e7bc6698e6bc9f1d37fce88b30d6274bc9, but the docs weren't updated. --- src/nvim/option_defs.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 8776597cbb..70e3df0060 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -564,7 +564,6 @@ EXTERN char_u *p_titlestring; /* 'titlestring' */ EXTERN char_u *p_tsr; /* 'thesaurus' */ EXTERN int p_ttimeout; /* 'ttimeout' */ EXTERN long p_ttm; /* 'ttimeoutlen' */ -EXTERN long p_ttyscroll; /* 'ttyscroll' */ EXTERN char_u *p_udir; /* 'undodir' */ EXTERN long p_ul; /* 'undolevels' */ EXTERN long p_ur; /* 'undoreload' */ -- cgit From a16eab9e57368188c834634cd824ce1ac5613db1 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Tue, 5 May 2015 22:00:43 -0400 Subject: Remove `-T` command-line option It didn't actually do anything after 3baba1e7bc6698e6bc9f1d37fce88b30d6274bc9 Helped-by: Justin M. Keyes --- src/nvim/main.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src') diff --git a/src/nvim/main.c b/src/nvim/main.c index ce96d2a7bf..5f0372f30e 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -100,7 +100,6 @@ typedef struct { bool headless; // Dont try to start an user interface // or read/write to stdio(unless // embedding) - char_u *term; /* specified terminal name */ int no_swap_file; /* "-n" argument used */ int use_debug_break_level; int window_count; /* number of windows to use */ @@ -1123,7 +1122,6 @@ static void command_line_scan(mparm_T *parmp) /*FALLTHROUGH*/ case 'S': /* "-S {file}" execute Vim script */ case 'i': /* "-i {viminfo}" use for viminfo */ - case 'T': /* "-T {terminal}" terminal name */ case 'u': /* "-u {vimrc}" vim inits file */ case 'U': /* "-U {gvimrc}" gvim inits file */ case 'W': /* "-W {scriptout}" overwrite */ @@ -1221,15 +1219,6 @@ scripterror: parmp->tagname = (char_u *)argv[0]; break; - case 'T': /* "-T {terminal}" terminal name */ - /* - * The -T term argument is always available and when - * HAVE_TERMLIB is supported it overrides the environment - * variable TERM. - */ - parmp->term = (char_u *)argv[0]; - break; - case 'u': /* "-u {vimrc}" vim inits file */ parmp->use_vimrc = argv[0]; break; @@ -2001,7 +1990,6 @@ static void usage(void) mch_msg(_(" -n No swap file, use memory only\n")); mch_msg(_(" -r, -L List swap files and exit\n")); mch_msg(_(" -r Recover crashed session\n")); - mch_msg(_(" -T Set terminal type to \n")); mch_msg(_(" -u Use instead of the default\n")); mch_msg(_(" -i Use instead of the default\n")); mch_msg(_(" --noplugin Don't load plugin scripts\n")); -- cgit