aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Reed <m.reed@mykolab.com>2015-01-11 21:00:06 -0500
committerMichael Reed <m.reed@mykolab.com>2015-01-11 21:00:06 -0500
commit16d0976150516b17de7a4c20d0e4939a5d6d4237 (patch)
treeb61cf74c66c31881e99b5a032e25e51fb96ed163
parentc53852a244fd78bcf11e37ddc94e8a847e80062a (diff)
downloadrneovim-16d0976150516b17de7a4c20d0e4939a5d6d4237.tar.gz
rneovim-16d0976150516b17de7a4c20d0e4939a5d6d4237.tar.bz2
rneovim-16d0976150516b17de7a4c20d0e4939a5d6d4237.zip
Remove QNX/pterm remnants
The function qnx_init() (wrapped in an ifdef in main.c) doesn't even exist.
-rw-r--r--runtime/doc/eval.txt2
-rw-r--r--runtime/doc/options.txt7
-rw-r--r--src/nvim/keymap.h4
-rw-r--r--src/nvim/main.c4
-rw-r--r--src/nvim/option_defs.h3
-rw-r--r--src/nvim/syntax.c10
-rw-r--r--src/nvim/term.c1
7 files changed, 3 insertions, 28 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 5ee66fc43b..65b1f2aa3c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6747,7 +6747,6 @@ mouse Compiled with support mouse.
mouse_dec Compiled with support for Dec terminal mouse.
mouse_gpm Compiled with support for gpm (Linux console mouse)
mouse_netterm Compiled with support for netterm mouse.
-mouse_pterm Compiled with support for qnx pterm mouse.
mouse_sysmouse Compiled with support for sysmouse (*BSD console mouse)
mouse_sgr Compiled with support for sgr mouse.
mouse_urxvt Compiled with support for urxvt mouse.
@@ -6767,7 +6766,6 @@ printer Compiled with |:hardcopy| support.
profile Compiled with |:profile| support.
python Compiled with Python 2.x interface. |has-python|
python3 Compiled with Python 3.x interface. |has-python|
-qnx QNX version of Vim.
quickfix Compiled with |quickfix| support.
reltime Compiled with |reltime()| support.
rightleft Compiled with 'rightleft' support.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 4a2646f1c4..8152c3d3c4 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4935,9 +4935,8 @@ A jump table for the options with a short description can be found at |Q_op|.
global
{not in Vi}
Enable the use of the mouse. Only works for certain terminals
- (xterm, MS-DOS, Win32 |win32-mouse|, QNX pterm, *BSD console with
- sysmouse and Linux console with gpm). For using the mouse in the
- GUI, see |gui-mouse|.
+ (xterm, Win32 |win32-mouse|, *BSD console with sysmouse and Linux
+ console with gpm). For using the mouse in the GUI, see |gui-mouse|.
The mouse can be enabled for different modes:
n Normal mode
v Visual mode
@@ -7402,8 +7401,6 @@ A jump table for the options with a short description can be found at |Q_op|.
rather complex sequence, starting with "<Esc>[".
This is also available for an Xterm, if it was
configured with "--enable-dec-locator".
- *pterm-mouse*
- pterm QNX pterm mouse handling.
*urxvt-mouse*
urxvt Mouse handling for the urxvt (rxvt-unicode) terminal.
The mouse works only if the terminal supports this
diff --git a/src/nvim/keymap.h b/src/nvim/keymap.h
index 94ea095ace..c82a95c00c 100644
--- a/src/nvim/keymap.h
+++ b/src/nvim/keymap.h
@@ -97,9 +97,6 @@
/* Used a termcap entry that produces a normal character. */
#define KS_KEY 242
-/* Used for the qnx pterm mouse. */
-#define KS_PTERM_MOUSE 241
-
/* Used for click in a tab pages label. */
#define KS_TABLINE 240
@@ -412,7 +409,6 @@ enum key_extra {
#define K_NETTERM_MOUSE TERMCAP2KEY(KS_NETTERM_MOUSE, KE_FILLER)
#define K_DEC_MOUSE TERMCAP2KEY(KS_DEC_MOUSE, KE_FILLER)
-#define K_PTERM_MOUSE TERMCAP2KEY(KS_PTERM_MOUSE, KE_FILLER)
#define K_URXVT_MOUSE TERMCAP2KEY(KS_URXVT_MOUSE, KE_FILLER)
#define K_SGR_MOUSE TERMCAP2KEY(KS_SGR_MOUSE, KE_FILLER)
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 1f6c8ddc81..f063cc1238 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -149,10 +149,6 @@ void early_init(void)
(void)mb_init(); // init mb_bytelen_tab[] to ones
eval_init(); // init global variables
-#ifdef __QNXNTO__
- qnx_init(); // PhAttach() for clipboard, (and gui)
-#endif
-
// Init the table of Normal mode commands.
init_normal_cmds();
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index 8b36df3276..99e8e645b6 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -576,13 +576,12 @@ EXTERN char_u *p_ttym; /* 'ttymouse' */
EXTERN unsigned ttym_flags;
# ifdef IN_OPTION_C
static char *(p_ttym_values[]) =
-{"xterm", "xterm2", "dec", "netterm", "pterm", "urxvt", "sgr", NULL};
+{"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_PTERM 0x10
# define TTYM_URXVT 0x20
# define TTYM_SGR 0x40
#endif
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 4e2be0cd44..e9a814bc97 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -6407,12 +6407,6 @@ do_highlight (
4+8, 4+8, 2+8, 2+8,
6+8, 6+8, 1+8, 1+8, 5+8,
5+8, 3+8, 3+8, 7+8, -1};
-#if defined(__QNXNTO__)
- static int *color_numbers_8_qansi = color_numbers_8;
- /* On qnx, the 8 & 16 color arrays are the same */
- if (STRNCMP(T_NAME, "qansi", 5) == 0)
- color_numbers_8_qansi = color_numbers_16;
-#endif
/* reduce calls to STRICMP a bit, it can be slow */
off = TOUPPER_ASC(*arg);
@@ -6433,11 +6427,7 @@ do_highlight (
if (color >= 0) {
if (t_colors == 8) {
/* t_Co is 8: use the 8 colors table */
-#if defined(__QNXNTO__)
- color = color_numbers_8_qansi[i];
-#else
color = color_numbers_8[i];
-#endif
if (key[5] == 'F') {
/* set/reset bold attribute to get light foreground
* colors (on some terminals, e.g. "linux") */
diff --git a/src/nvim/term.c b/src/nvim/term.c
index b7c30300b0..b78b01b68a 100644
--- a/src/nvim/term.c
+++ b/src/nvim/term.c
@@ -1473,7 +1473,6 @@ int set_termname(char_u *term)
# define HMT_NORMAL 1
# define HMT_NETTERM 2
# define HMT_DEC 4
-# define HMT_PTERM 8
# define HMT_URXVT 16
# define HMT_SGR 32