diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/message.c | 8 | ||||
| -rw-r--r-- | src/nvim/normal.c | 2 | ||||
| -rw-r--r-- | src/nvim/option.c | 3 | ||||
| -rw-r--r-- | src/nvim/os_unix.c | 1 | ||||
| -rw-r--r-- | src/nvim/term.c | 63 | ||||
| -rw-r--r-- | src/nvim/testdir/test14.in | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test17.in | 6 |
7 files changed, 4 insertions, 85 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index 5832b2e7cb..808253d33c 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -3624,13 +3624,7 @@ int vim_vsnprintf(char *str, size_t str_m, char *fmt, va_list ap, typval_T *tvs) remove_trailing_zeroes = TRUE; } - if (fmt_spec == 'f' && -#ifdef VAX - abs_f > 1.0e38 -#else - abs_f > 1.0e307 -#endif - ) { + if (fmt_spec == 'f' && abs_f > 1.0e307) { /* Avoid a buffer overflow */ strcpy(tmp, "inf"); str_arg_l = 3; diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 192633a996..1d4b47414c 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -2102,7 +2102,7 @@ do_mouse ( * Windows only shows the popup menu on the button up event. */ #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) \ - || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC) + || defined(FEAT_GUI_MAC) if (!is_click) return false; #endif diff --git a/src/nvim/option.c b/src/nvim/option.c index fd0978f3a6..b3a883c79e 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1179,9 +1179,6 @@ static struct vimoption {"optimize", "opt", P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"osfiletype", "oft", P_STRING|P_ALLOCED|P_VI_DEF, - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"paragraphs", "para", P_STRING|P_VI_DEF, (char_u *)&p_para, PV_NONE, {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp", diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index 677976e3e1..a9c1fec0b4 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -9,7 +9,6 @@ /* * os_unix.c -- code for all flavors of Unix (BSD, SYSV, SVR4, POSIX, ...) - * Also for BeOS * * A lot of this file was originally written by Juergen Weigert and later * changed beyond recognition. diff --git a/src/nvim/term.c b/src/nvim/term.c index 40d6b4c170..24969bf90f 100644 --- a/src/nvim/term.c +++ b/src/nvim/term.c @@ -278,69 +278,6 @@ static struct builtin_term builtin_termcaps[] = {TERMCAP2KEY('*', '7'), "\233\065\065~"}, /* shifted end key */ # endif -# if defined(__BEOS__) || defined(ALL_BUILTIN_TCAPS) - /* - * almost standard ANSI terminal, default for bebox - */ - {(int)KS_NAME, "beos-ansi"}, - {(int)KS_CE, "\033[K"}, - {(int)KS_CD, "\033[J"}, - {(int)KS_AL, "\033[L"}, -# ifdef TERMINFO - {(int)KS_CAL, "\033[%p1%dL"}, -# else - {(int)KS_CAL, "\033[%dL"}, -# endif - {(int)KS_DL, "\033[M"}, -# ifdef TERMINFO - {(int)KS_CDL, "\033[%p1%dM"}, -# else - {(int)KS_CDL, "\033[%dM"}, -# endif - {(int)KS_CL, "\033[H\033[2J"}, -#ifdef notyet - {(int)KS_VI, "[VI]"}, /* cursor invisible, VT320: CSI ? 25 l */ - {(int)KS_VE, "[VE]"}, /* cursor visible, VT320: CSI ? 25 h */ -#endif - {(int)KS_ME, "\033[m"}, /* normal mode */ - {(int)KS_MR, "\033[7m"}, /* reverse */ - {(int)KS_MD, "\033[1m"}, /* bold */ - {(int)KS_SO, "\033[31m"}, /* standout mode: red */ - {(int)KS_SE, "\033[m"}, /* standout end */ - {(int)KS_CZH, "\033[35m"}, /* italic: purple */ - {(int)KS_CZR, "\033[m"}, /* italic end */ - {(int)KS_US, "\033[4m"}, /* underscore mode */ - {(int)KS_UE, "\033[m"}, /* underscore end */ - {(int)KS_CCO, "8"}, /* allow 8 colors */ -# ifdef TERMINFO - {(int)KS_CAB, "\033[4%p1%dm"}, /* set background color */ - {(int)KS_CAF, "\033[3%p1%dm"}, /* set foreground color */ -# else - {(int)KS_CAB, "\033[4%dm"}, /* set background color */ - {(int)KS_CAF, "\033[3%dm"}, /* set foreground color */ -# endif - {(int)KS_OP, "\033[m"}, /* reset colors */ - {(int)KS_MS, "y"}, /* safe to move cur in reverse mode */ - {(int)KS_UT, "y"}, /* guessed */ - {(int)KS_LE, "\b"}, -# ifdef TERMINFO - {(int)KS_CM, "\033[%i%p1%d;%p2%dH"}, -# else - {(int)KS_CM, "\033[%i%d;%dH"}, -# endif - {(int)KS_SR, "\033M"}, -# ifdef TERMINFO - {(int)KS_CRI, "\033[%p1%dC"}, -# else - {(int)KS_CRI, "\033[%dC"}, -# endif - - {K_UP, "\033[A"}, - {K_DOWN, "\033[B"}, - {K_LEFT, "\033[D"}, - {K_RIGHT, "\033[C"}, -# endif - # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) || defined(SOME_BUILTIN_TCAPS) /* * standard ANSI terminal, default for unix diff --git a/src/nvim/testdir/test14.in b/src/nvim/testdir/test14.in index fb987ebc88..6ebec99af6 100644 --- a/src/nvim/testdir/test14.in +++ b/src/nvim/testdir/test14.in @@ -13,11 +13,7 @@ vaBiBD:?Bug?,/Piece/-2w! test.out :s/i/~u~/ :s/o/~~~/ :.w >>test.out -:if has("ebcdic") -: let tt = "o\<C-V>193\<C-V>xc2\<C-V>o303 \<C-V>90a\<C-V>xfg\<C-V>o578\<Esc>" -:else -: let tt = "o\<C-V>65\<C-V>x42\<C-V>o103 \<C-V>33a\<C-V>xfg\<C-V>o78\<Esc>" -:endif +:let tt = "o\<C-V>65\<C-V>x42\<C-V>o103 \<C-V>33a\<C-V>xfg\<C-V>o78\<Esc>" :exe "normal " . tt :unlet tt :.w >>test.out diff --git a/src/nvim/testdir/test17.in b/src/nvim/testdir/test17.in index bc542c7625..64534ec77c 100644 --- a/src/nvim/testdir/test17.in +++ b/src/nvim/testdir/test17.in @@ -4,11 +4,7 @@ Tests for: STARTTEST :so small.vim -:if has("ebcdic") -: set isfname=@,240-249,/,.,-,_,+,,,$,:,~,{,} -:else -: set isfname=@,48-57,/,.,-,_,+,,,$,:,~,{,} -:endif +:set isfname=@,48-57,/,.,-,_,+,,,$,:,~,{,} :function! DeleteDirectory(dir) : if has("win16") || has("win32") || has("win64") || has("dos16") || has("dos32") : exec "silent !rmdir /Q /S " . a:dir |