From 3969823759a7f4aac30d6ce279e83290e61f0acc Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Wed, 3 Dec 2014 19:52:21 -0500 Subject: [PATCH 1/8] docs: Remove BeOS/Haiku remnants --- runtime/doc/eval.txt | 1 - runtime/doc/options.txt | 1 - runtime/doc/todo.txt | 4 +-- runtime/doc/vi_diff.txt | 3 +- src/nvim/os_unix.c | 1 - src/nvim/term.c | 63 ----------------------------------------- 6 files changed, 2 insertions(+), 71 deletions(-) diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 092994c11d..58ad5481c3 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -6666,7 +6666,6 @@ arp Compiled with ARP support (Amiga). autocmd Compiled with autocommand support. |autocommand| balloon_eval Compiled with |balloon-eval| support. balloon_multiline GUI supports multiline balloons. -beos BeOS version of Vim. browse Compiled with |:browse| support, and browse() will work. browsefilter Compiled with support for |browsefilter|. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 8672ab2af9..906b628af2 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -7070,7 +7070,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'term' string (default is $TERM, if that fails: in the GUI: "builtin_gui" on Amiga: "amiga" - on BeOS: "beos-ansi" on Mac: "mac-ansi" on MS-DOS: "pcterm" on Unix: "ansi" diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 45f3ae6c4a..e3468ec459 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -232,8 +232,6 @@ Go through more coverity reports. Patch to add ":undorecover", get as much text out of the undo file as possible. (Christian Brabandt, 2014 Mar 12) -Include Haiku port? (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24) - Updated spec ftplugin. (Matěj Cepl, 2013 Oct 16) Some quickfix messages appear twice. (Gary Johnson, 2014 Feb 16) @@ -2249,7 +2247,7 @@ GUI: Need better separation of Vim core and GUI code. 8 When fontset support is enabled, setting 'guifont' to a single font doesn't work. -8 Menu priority for sub-menus for: Amiga, BeOS. +8 Menu priority for sub-menus for: Amiga. 8 When translating menus ignore the part after the Tab, the shortcut. So that the same menu item with a different shortcut (e.g., for the Mac) are still translated. diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index af06302243..a477b98204 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -137,7 +137,6 @@ Support for different systems. - In protected mode on Windows 3.1 and MS-DOS (DPMI driver required). - Windows 95 and Windows NT, with support for long file names. - VMS - - BeOS - Macintosh - Risc OS - IBM OS/390 @@ -162,7 +161,7 @@ Graphical User Interface (GUI). |gui| define your own menus. Better support for CTRL/SHIFT/ALT keys in combination with special keys and mouse. Supported for various platforms, such as X11 (with Motif and Athena interfaces), GTK, Win32 - (Windows 95 and later), BeOS, Amiga and Macintosh. + (Windows 95 and later), Amiga and Macintosh. Multiple windows and buffers. |windows.txt| Vim can split the screen into several windows, each editing a 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 From 33b459b6724bd252c170b22e18a020d886791076 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 8 Dec 2014 02:57:21 -0500 Subject: [PATCH 2/8] docs: Remove VAX remnants --- src/nvim/message.c | 8 +------- 1 file changed, 1 insertion(+), 7 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; From 365cf90efbc516ef2e83d0f8152eb7f7c3acbb3c Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 8 Dec 2014 20:26:55 -0500 Subject: [PATCH 3/8] docs: Remove EBCDIC remnants --- runtime/doc/eval.txt | 1 - runtime/doc/mbyte.txt | 3 +- runtime/doc/print.txt | 10 ++--- runtime/doc/spell.txt | 2 - runtime/menu.vim | 10 +---- runtime/print/ebcdic-uk.ps | 40 ------------------- runtime/syntax/help.vim | 12 ++---- runtime/syntax/sed.vim | 10 ++--- src/nvim/testdir/test14.in | 6 +-- src/nvim/testdir/test17.in | 6 +-- .../legacy/026_execute_while_if_spec.lua | 18 ++------- 11 files changed, 17 insertions(+), 101 deletions(-) delete mode 100644 runtime/print/ebcdic-uk.ps diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 58ad5481c3..2753325268 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -6688,7 +6688,6 @@ digraphs Compiled with support for digraphs. dnd Compiled with support for the "~ register |quote_~|. dos16 16 bits DOS version of Vim. dos32 32 bits DOS (DJGPP) version of Vim. -ebcdic Compiled on a machine with ebcdic character set. emacs_tags Compiled with support for Emacs tags. eval Compiled with expression evaluation support. Always true, of course! diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 87ae8777c2..2a5ccc626e 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -276,8 +276,7 @@ u Unicode Universal encoding, can replace all others. ISO 10646. Other encodings cannot be used by Vim internally. But files in other encodings can be edited by using conversion, see 'fileencoding'. -Note that all encodings must use ASCII for the characters up to 128 (except -when compiled for EBCDIC). +Note that all encodings must use ASCII for the characters up to 128. Supported 'encoding' values are: *encoding-values* 1 latin1 8-bit characters (ISO 8859-1, also used for cp1252) diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index 5fcaa6f624..0ffc661c95 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -96,8 +96,7 @@ If the option is empty, then vim will use the system default printer for Windows: cp1252, Macintosh: mac-roman, VMS: dec-mcs, - HPUX: hp-roman8, - EBCDIC: ebcdic-uk) + HPUX: hp-roman8) global Sets the character encoding used when printing. This option tells VIM which print character encoding file from the "print" directory in 'runtimepath' to @@ -121,10 +120,9 @@ other than latin1 will require VIM to be compiled with the |+iconv| feature. If no conversion is possible then printing will fail. Any characters that cannot be converted will be replaced with upside down question marks. -Four print character encoding files are provided to support default Mac, VMS, -HPUX, and EBCDIC character encodings and are used by default on these -platforms. Code page 1252 print character encoding is used by default on -the Windows platform. +Three print character encoding files are provided to support default Mac, VMS, +and HPUX character encodings and are used by default on these platforms. Code +page 1252 print character encoding is used by default on the Windows platform. *pexpr-option* 'printexpr' 'pexpr' String (default: see below) diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 3ffd8932e1..91322def5b 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -336,8 +336,6 @@ If 'encoding' is "latin1" Vim will look for: This assumes none of them are found (Polish doesn't make sense when leaving out the non-ASCII characters). -Spelling for EBCDIC is currently not supported. - A spell file might not be available in the current 'encoding'. See |spell-mkspell| about how to create a spell file. Converting a spell file with "iconv" will NOT work! diff --git a/runtime/menu.vim b/runtime/menu.vim index e0745585a6..ba9250c0ba 100644 --- a/runtime/menu.vim +++ b/runtime/menu.vim @@ -697,21 +697,13 @@ endfunc func! s:BMHash(name) " Make name all upper case, so that chars are between 32 and 96 let nm = substitute(a:name, ".*", '\U\0', "") - if has("ebcdic") - " HACK: Replace all non alphabetics with 'Z' - " Just to make it work for now. - let nm = substitute(nm, "[^A-Z]", 'Z', "g") - let sp = char2nr('A') - 1 - else - let sp = char2nr(' ') - endif + let sp = char2nr(' ') " convert first six chars into a number for sorting: return (char2nr(nm[0]) - sp) * 0x800000 + (char2nr(nm[1]) - sp) * 0x20000 + (char2nr(nm[2]) - sp) * 0x1000 + (char2nr(nm[3]) - sp) * 0x80 + (char2nr(nm[4]) - sp) * 0x20 + (char2nr(nm[5]) - sp) endfunc func! s:BMHash2(name) let nm = substitute(a:name, ".", '\L\0', "") - " Not exactly right for EBCDIC... if nm[0] < 'a' || nm[0] > 'z' return '&others.' elseif nm[0] <= 'd' diff --git a/runtime/print/ebcdic-uk.ps b/runtime/print/ebcdic-uk.ps deleted file mode 100644 index 1070074bff..0000000000 --- a/runtime/print/ebcdic-uk.ps +++ /dev/null @@ -1,40 +0,0 @@ -%!PS-Adobe-3.0 Resource-Encoding -%%Title: VIM-ebcdic-uk -%%Version: 1.0 0 -%%EndComments -/VIM-ebcdic-uk[ -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/space /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /dollar /period /less /parenleft /plus /bar -/ampersand /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /exclam /sterling /asterisk /parenright /semicolon /logicalnot -/minus /slash /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /brokenbar /comma /percent /underscore /greater /question -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /quotereversed /colon /numbersign /at /quoteright /equal /quotedbl -/.notdef /a /b /c /d /e /f /g -/h /i /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /j /k /l /m /n /o /p -/q /r /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /macron /s /t /u /v /w /x -/y /z /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/braceleft /A /B /C /D /E /F /G -/H /I /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/braceright /J /K /L /M /N /O /P -/Q /R /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/backslash /.notdef /S /T /U /V /W /X -/Y /Z /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/zero /one /two /three /four /five /six /seven -/eight /nine /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef] -/Encoding defineresource pop -% vim:ff=unix: -%%EOF diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim index c55d32ef7c..b306e66e59 100644 --- a/runtime/syntax/help.vim +++ b/runtime/syntax/help.vim @@ -19,15 +19,9 @@ if has("conceal") else syn region helpExample matchgroup=helpIgnore start=" >$" start="^>$" end="^[^ \t]"me=e-1 end="^<" endif -if has("ebcdic") - syn match helpHyperTextJump "\\\@= 508 || !exists("did_sed_syntax_inits") if exists("highlight_sedtabs") HiLink sedTab Todo endif - let __sed_i = char2nr(" ") " ASCII: 32, EBCDIC: 64 + let __sed_i = char2nr(" ") " ASCII: 32 while __sed_i <= __sed_last exe "HiLink sedRegexp".__sed_i "Macro" exe "HiLink sedReplacement".__sed_i "NONE" 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\193\xc2\o303 \90a\xfg\o578\" -:else -: let tt = "o\65\x42\o103 \33a\xfg\o78\" -:endif +:let tt = "o\65\x42\o103 \33a\xfg\o78\" :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 diff --git a/test/functional/legacy/026_execute_while_if_spec.lua b/test/functional/legacy/026_execute_while_if_spec.lua index 9acbf76673..ffe37819de 100644 --- a/test/functional/legacy/026_execute_while_if_spec.lua +++ b/test/functional/legacy/026_execute_while_if_spec.lua @@ -13,11 +13,7 @@ describe(':execute, :while and :if', function() let i = 0 while i < 12 let i = i + 1 - if has("ebcdic") - execute "normal o" . i . "\047" - else - execute "normal o" . i . "\033" - endif + execute "normal o" . i . "\033" if i % 2 normal Ax if i == 9 @@ -28,21 +24,13 @@ describe(':execute, :while and :if', function() else let j = 9 while j > 0 - if has("ebcdic") - execute "normal" j . "a" . j . "\x27" - else - execute "normal" j . "a" . j . "\x1b" - endif + execute "normal" j . "a" . j . "\x1b" let j = j - 1 endwhile endif endif if i == 9 - if has("ebcdic") - execute "normal Az\047" - else - execute "normal Az\033" - endif + execute "normal Az\033" endif endwhile unlet i j From a08e31368fc8de6dc6234942087e56d498452697 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 8 Dec 2014 20:59:09 -0500 Subject: [PATCH 4/8] docs: Remove 'osfiletype' remnants Even when this was finally removed 6 months ago in b2b920f, it had already been disabled for a while. Due to this, just remove all remnants of the option as opposed to putting a placeholder like what was done for 'shortname'and 'cryptmethod'. --- runtime/doc/filetype.txt | 32 -------------------------------- runtime/doc/options.txt | 8 -------- runtime/doc/quickref.txt | 1 - runtime/doc/todo.txt | 2 -- runtime/optwin.vim | 7 +------ runtime/syntax/vim.vim | 4 ++-- src/nvim/option.c | 3 --- 7 files changed, 3 insertions(+), 54 deletions(-) diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 94454fb469..15f1b15be5 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -268,38 +268,6 @@ the 'runtimepath' for a directory to use. If there isn't one, set 'runtimepath' in the |system-vimrc|. Be careful to keep the default directories! - - *autocmd-osfiletypes* -NOTE: this code is currently disabled, as the RISC OS implementation was -removed. In the future this will use the 'filetype' option. - -On operating systems which support storing a file type with the file, you can -specify that an autocommand should only be executed if the file is of a -certain type. - -The actual type checking depends on which platform you are running Vim -on; see your system's documentation for details. - -To use osfiletype checking in an autocommand you should put a list of types to -match in angle brackets in place of a pattern, like this: > - - :au BufRead *.html,<&faf;HTML> runtime! syntax/html.vim - -This will match: - -- Any file whose name ends in ".html" -- Any file whose type is "&faf" or "HTML", where the meaning of these types - depends on which version of Vim you are using. - Unknown types are considered NOT to match. - -You can also specify a type and a pattern at the same time (in which case they -must both match): > - - :au BufRead <&fff>diff* - -This will match files of type "&fff" whose names start with "diff". - - *plugin-details* The "plugin" directory can be in any of the directories in the 'runtimepath' option. All of these directories will be searched for plugins and they are diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 906b628af2..d8e0c501b0 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -5204,14 +5204,6 @@ A jump table for the options with a short description can be found at |Q_op|. This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. - - *'osfiletype'* *'oft'* -'osfiletype' 'oft' string (default: "") - local to buffer - {not in Vi} - This option was supported on RISC OS, which has been removed. - - *'paragraphs'* *'para'* 'paragraphs' 'para' string (default "IPLPPPQPP TPHPLIPpLpItpplpipbp") global diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 9a9e85d421..d320e6cd24 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -802,7 +802,6 @@ Short explanation of each option: *option-list* 'omnifunc' 'ofu' function for filetype-specific completion 'opendevice' 'odev' allow reading/writing devices on MS-Windows 'operatorfunc' 'opfunc' function to be called for |g@| operator -'osfiletype' 'oft' no longer supported 'paragraphs' 'para' nroff macros that separate paragraphs 'paste' allow pasting text 'pastetoggle' 'pt' key code that causes 'paste' to toggle diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index e3468ec459..7ac0055321 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -3820,8 +3820,6 @@ GUI: Autocommands: -9 Rework the code from FEAT_OSFILETYPE for autocmd-osfiletypes to use - 'filetype'. Only for when the current buffer is known. - Put autocommand event names in a hashtable for faster lookup? 8 When the SwapExists event is triggered, provide information about the swap file, e.g., whether the process is running, file was modified, etc. diff --git a/runtime/optwin.vim b/runtime/optwin.vim index c1e59982cf..eab91de3df 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1099,13 +1099,8 @@ if has("quickfix") endif -if has("msdos") || has("win16") || has("win32") || has("osfiletype") +if has("msdos") || has("win16") || has("win32") call Header("system specific") - if has("osfiletype") - call append("$", "osfiletype\tOS-specific information about the type of file") - call append("$", "\t(local to buffer)") - call OptionL("oft") - endif if has("msdos") || has("win16") || has("win32") call append("$", "shellslash\tuse forward slashes in file names; for Unix-like shells") call BinOptionG("ssl", &ssl) diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 8beb64d045..47d74090d1 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -32,8 +32,8 @@ syn keyword vimOption contained ai ambw ari aw backupext beval brk buflisted cdp syn keyword vimOption contained akm anti arshape awa backupskip bex browsedir buftype cedit cindent clipboard cole complete crb cscopetagorder csto cwh dg dip eadirection ek equalprg ex fdi fen fileencoding fk foldcolumn foldmethod formatoptions gd go guifont guitabtooltip hid hkp iconstring imc imsearch inde insertmode iskeyword keymodel laststatus lisp lpl magic maxfuncdepth menuitems mm modifiable mousem mps number opendevice paste pex pmbcs printencoding prompt rdt report rlc ruler scb scs sessionoptions shellquote shiftround showfulltag sidescrolloff smarttab sp spf srr startofline suffixes switchbuf ta tagrelative tbis textauto timeout tm ts ttybuiltin tx undolevels vbs viewdir wak weirdinvert wic wildmenu winfixheight wiv wop writebackup syn keyword vimOption contained al antialias autochdir background balloondelay bexpr bk bs casemap cf cink cmdheight colorcolumn completefunc copyindent cscopeverbose csverb debug dict dir eb enc errorbells expandtab fdl fenc fileencodings fkmap foldenable foldminlines formatprg gdefault gp guifontset helpfile hidden hl ignorecase imcmdline imsf indentexpr is isp keywordprg lazyredraw lispwords ls makeef maxmapdepth mfd mmd modified mousemodel msm numberwidth operatorfunc pastetoggle pexpr pmbfn printexpr pt re restorescreen rnu rulerformat scr sect sft shellredir shiftwidth showmatch siso smc spc spl ss statusline suffixesadd sws tabline tags tbs textmode timeoutlen to tsl ttyfast uc undoreload vdir viewoptions warn wfh wig wildmode winfixwidth wiw wrap writedelay syn keyword vimOption contained aleph ar autoindent backspace ballooneval bg bkc bsdir cb cfu cinkeys cmdwinheight columns completeopt cot cscopepathcomp cspc cuc deco dictionary directory ed encoding errorfile exrc fdls fencs fileformat flp foldexpr foldnestmax fp gfm grepformat guifontwide helpheight highlight hlg im imd imstatusfunc indentkeys isf isprint km lbr list lsp makeprg maxmem mh mmp more mouses mzq nuw opfunc patchexpr pfn popt printfont pumheight readonly revins ro runtimepath scroll sections sh shellslash shm showmode sj smd spell splitbelow ssl stl sw sxe tabpagemax tagstack tenc textwidth title toolbar tsr ttym udf updatecount ve viminfo wb wfw wildchar wildoptions winheight wm wrapmargin ws -syn keyword vimOption contained allowrevins arab autoread backup balloonexpr bh bl bsk cc ch cino cmp com concealcursor cp cscopeprg csprg cul def diff display edcompatible endofline errorformat fcl fdm fex fileformats fml foldignore foldopen fs gfn grepprg guiheadroom helplang history hls imactivatefunc imdisable inc indk isfname joinspaces kmp lcs listchars lw mat maxmempattern mis mmt mouse mouseshape mzquantum odev osfiletype patchmode ph preserveindent printheader pvh redrawtime ri rs sb scrollbind secure shcf shelltemp shortmess showtabline slm spellcapcheck splitright ssop stmp swapfile sxq tabstop tal term tf titlelen toolbariconsize ttimeout ttymouse udir updatetime verbose virtualedit wc wh wildcharm wim winminheight wmh wrapscan ww -syn keyword vimOption contained altkeymap arabic autowrite backupcopy bdir bin bomb bt ccv charconvert cinoptions cms comments conceallevel cpo cscopequickfix csqf cursorbind define diffexpr dy ef eol esckeys fcs fdn ff fileignorecase fmr foldlevel foldtext fsync gfs gtl guioptions hf hk hlsearch imactivatekey imi include inex isi js kp linebreak lm lz matchpairs maxmemtot mkspellmem mod mousef mouset nf oft pa path pheader previewheight printmbcharset pvw regexpengine rightleft rtp sbo scrolljump sel shell shq sm so spellfile spr st sts swapsync syn tag tb termbidi tgst titleold top ttimeoutlen ttyscroll ul ur unnamedclip unc verbosefile visualbell +syn keyword vimOption contained allowrevins arab autoread backup balloonexpr bh bl bsk cc ch cino cmp com concealcursor cp cscopeprg csprg cul def diff display edcompatible endofline errorformat fcl fdm fex fileformats fml foldignore foldopen fs gfn grepprg guiheadroom helplang history hls imactivatefunc imdisable inc indk isfname joinspaces kmp lcs listchars lw mat maxmempattern mis mmt mouse mouseshape mzquantum odev patchmode ph preserveindent printheader pvh redrawtime ri rs sb scrollbind secure shcf shelltemp shortmess showtabline slm spellcapcheck splitright ssop stmp swapfile sxq tabstop tal term tf titlelen toolbariconsize ttimeout ttymouse udir updatetime verbose virtualedit wc wh wildcharm wim winminheight wmh wrapscan ww +syn keyword vimOption contained altkeymap arabic autowrite backupcopy bdir bin bomb bt ccv charconvert cinoptions cms comments conceallevel cpo cscopequickfix csqf cursorbind define diffexpr dy ef eol esckeys fcs fdn ff fileignorecase fmr foldlevel foldtext fsync gfs gtl guioptions hf hk hlsearch imactivatekey imi include inex isi js kp linebreak lm lz matchpairs maxmemtot mkspellmem mod mousef mouset nf pa path pheader previewheight printmbcharset pvw regexpengine rightleft rtp sbo scrolljump sel shell shq sm so spellfile spr st sts swapsync syn tag tb termbidi tgst titleold top ttimeoutlen ttyscroll ul ur unnamedclip unc verbosefile visualbell " vimOptions: These are the turn-off setting variants {{{2 syn keyword vimOption contained noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobinary nobk nobuflisted nocin noconfirm nocopyindent nocscoperelative nocsre nocuc nocursorcolumn nodelcombine nodigraph noed noendofline noerrorbells noex nofen nofk nogd nohid nohkmap nohkp nohlsearch noicon noim noimcmdline noimdisable noinf noinsertmode nojoinspaces nolazyredraw nolinebreak nolist nolpl noma nomagic noml nomodeline nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw norelativenumber norestorescreen nori norl noro noru nosb noscb noscs nosft noshelltemp noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbi notbs noterse notextmode notgst notimeout noto notr nottybuiltin notx noundofile novisualbell nowarn noweirdinvert nowfw nowildignorecase nowinfixheight nowiv nowrap nowrite nowritebackup 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", From b75989b57293c479bf8f481833139c4eaa3c7d61 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 8 Dec 2014 21:03:16 -0500 Subject: [PATCH 5/8] docs: Remove RISC OS remnants --- runtime/doc/filetype.txt | 1 - runtime/doc/options.txt | 6 +----- runtime/doc/starting.txt | 2 +- runtime/doc/usr_05.txt | 1 - runtime/doc/vi_diff.txt | 1 - 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 15f1b15be5..0a726072c5 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -36,7 +36,6 @@ Detail: The ":filetype on" command will load one of these files: Amiga $VIMRUNTIME/filetype.vim Mac $VIMRUNTIME:filetype.vim MS-DOS $VIMRUNTIME\filetype.vim - RiscOS Vim:Filetype Unix $VIMRUNTIME/filetype.vim VMS $VIMRUNTIME/filetype.vim This file is a Vim script that defines autocommands for the diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index d8e0c501b0..6fcbd56cc6 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -5688,9 +5688,6 @@ A jump table for the options with a short description can be found at |Q_op|. Macintosh: "$VIM:vimfiles, $VIMRUNTIME, $VIM:vimfiles:after" - RISC-OS: "Choices:vimfiles, - $VIMRUNTIME, - Choices:vimfiles/after" VMS: "sys$login:vimfiles, $VIM/vimfiles, $VIMRUNTIME, @@ -7603,8 +7600,7 @@ A jump table for the options with a short description can be found at |Q_op|. "$VIM/vimfiles/view", for Unix: "~/.vim/view", for Macintosh: "$VIM:vimfiles:view" - for VMS: "sys$login:vimfiles/view" - for RiscOS: "Choices:vimfiles/view") + for VMS: "sys$login:vimfiles/view") global {not in Vi} {not available when compiled without the |+mksession| diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index dbd87721fc..bceaea0d83 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -767,7 +767,7 @@ accordingly. Vim proceeds in this order: a. If vim was started as |evim| or |eview| or with the |-y| argument, the script $VIMRUNTIME/evim.vim will be loaded. *system-vimrc* - b. For Unix, MS-DOS, MS-Windows, VMS, Macintosh, RISC-OS and Amiga + b. For Unix, MS-DOS, MS-Windows, VMS, Macintosh, and Amiga, the system vimrc file is read for initializations. The path of this file is shown with the ":version" command. Mostly it's "$VIM/vimrc". Note that this file is ALWAYS read in 'compatible' mode, since the diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index ac377675ee..a409d7e3ce 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -317,7 +317,6 @@ Then copy the file to your plugin directory: Amiga s:vimfiles/plugin Macintosh $VIM:vimfiles:plugin Mac OS X ~/.vim/plugin/ - RISC-OS Choices:vimfiles.plugin Example for Unix (assuming you didn't have a plugin directory yet): > diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index a477b98204..942fbb685e 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -138,7 +138,6 @@ Support for different systems. - Windows 95 and Windows NT, with support for long file names. - VMS - Macintosh - - Risc OS - IBM OS/390 Note that on some systems features need to be disabled to reduce resource usage, esp. on MS-DOS. For some outdated systems you need to From 500cce10911a48207f17afee68766a6fb69cc886 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Tue, 9 Dec 2014 19:43:27 -0500 Subject: [PATCH 6/8] docs: Remove OS/390 remnants --- runtime/doc/options.txt | 1 - runtime/doc/vi_diff.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 6fcbd56cc6..f8b337c0d0 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4265,7 +4265,6 @@ A jump table for the options with a short description can be found at |Q_op|. "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,=" for AMIGA: "@,48-57,/,.,-,_,+,,,$,:" for VMS: "@,48-57,/,.,-,_,+,,,#,$,%,<,>,[,],:,;,~" - for OS/390: "@,240-249,/,.,-,_,+,,,#,$,%,~,=" otherwise: "@,48-57,/,.,-,_,+,,,#,$,%,~,=") global {not in Vi} diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index 942fbb685e..a3abd2cfd3 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -138,7 +138,6 @@ Support for different systems. - Windows 95 and Windows NT, with support for long file names. - VMS - Macintosh - - IBM OS/390 Note that on some systems features need to be disabled to reduce resource usage, esp. on MS-DOS. For some outdated systems you need to use an older Vim version. From ed4356e75da004fc7ae27a39892e6064b76ac76a Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 8 Dec 2014 21:21:47 -0500 Subject: [PATCH 7/8] docs: Remove Photon remnants Also get rid of some platform references made irrelevant by the removal of their respective platform specific GUI code. --- runtime/doc/eval.txt | 1 - runtime/doc/gui.txt | 21 ++++++++------------- runtime/doc/options.txt | 9 ++++----- runtime/doc/todo.txt | 2 +- runtime/menu.vim | 2 +- src/nvim/normal.c | 2 +- 6 files changed, 15 insertions(+), 22 deletions(-) diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 2753325268..46ee28a461 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -6714,7 +6714,6 @@ gui_gtk Compiled with GTK+ GUI (any version). gui_gtk2 Compiled with GTK+ 2 GUI (gui_gtk is also defined). gui_mac Compiled with Macintosh GUI. gui_motif Compiled with Motif GUI. -gui_photon Compiled with Photon GUI. gui_running Vim is running in the GUI, or it will start soon. gui_win32 Compiled with MS Windows Win32 GUI. gui_win32s idem, and Win32s system being used (Windows 3.1) diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index bdddec585d..c174914c54 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -24,9 +24,7 @@ Other GUI documentation: 1. Starting the GUI *gui-start* *E229* *E233* First you must make sure you actually have a version of Vim with the GUI code -included. You can check this with the ":version" command, it says "with xxx -GUI", where "xxx" is X11-Motif, X11-Athena, Photon, GTK, GTK2, etc., or -"MS-Windows 32 bit GUI version". +included. How to start the GUI depends on the system used. Mostly you can run the GUI version of Vim with: @@ -690,13 +688,10 @@ because the item will never be selected. Use a single colon to keep it simple. *gui-toolbar* -The toolbar is currently available in the Win32, Athena, Motif, GTK+ (X11), -and Photon GUI. It should turn up in other GUIs in due course. The -default toolbar is setup in menu.vim. -The display of the toolbar is controlled by the 'guioptions' letter 'T'. You -can thus have menu & toolbar together, or either on its own, or neither. -The appearance is controlled by the 'toolbar' option. You can choose between -an image, text or both. +The default toolbar is setup in menu.vim. The display of the toolbar is +controlled by the 'guioptions' letter 'T'. You can thus have menu & toolbar +together, or either on its own, or neither. The appearance is controlled by +the 'toolbar' option. You can choose between an image, text or both. *toolbar-icon* The toolbar is defined as a special menu called ToolBar, which only has one @@ -779,9 +774,9 @@ from the main menu bar. You must then use the |:popup| or |:tearoff| command to display it. *popup-menu* -In the Win32, GTK+, Motif, Athena and Photon GUI, you can define the -special menu "PopUp". This is the menu that is displayed when the right mouse -button is pressed, if 'mousemodel' is set to popup or popup_setpos. +You can define the special menu "PopUp". This is the menu that is displayed +when the right mouse button is pressed, if 'mousemodel' is set to popup or +popup_setpos. 5.3 Showing What Menus Are Mapped To *showing-menus* diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index f8b337c0d0..c646caae4f 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3451,7 +3451,7 @@ A jump table for the options with a short description can be found at |Q_op|. the case of X). The font names given should be "normal" fonts. Vim will try to find the related bold and italic fonts. - For Win32, GTK, Motif, Mac OS and Photon: > + For Win32, GTK, Motif, and Mac OS: > :set guifont=* < will bring up a font requester, where you can pick the font you want. @@ -3648,7 +3648,7 @@ A jump table for the options with a short description can be found at |Q_op|. 't' Include tearoff menu items. Currently only works for Win32, GTK+, and Motif 1.2 GUI. *'go-T'* - 'T' Include Toolbar. Currently only in Win32, GTK+, Motif, Photon + 'T' Include Toolbar. Currently only in Win32, GTK+, Motif, and Athena GUIs. *'go-r'* 'r' Right-hand scrollbar is always present. @@ -7321,8 +7321,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'toolbar'* *'tb'* 'toolbar' 'tb' string (default "icons,tooltips") global - {only for |+GUI_GTK|, |+GUI_Athena|, |+GUI_Motif| and - |+GUI_Photon|} + {only for |+GUI_GTK|, |+GUI_Athena|, and |+GUI_Motif|} The contents of this option controls various toolbar settings. The possible values are: icons Toolbar buttons are shown with icons. @@ -7993,7 +7992,7 @@ A jump table for the options with a short description can be found at |Q_op|. 'winaltkeys' 'wak' string (default "menu") global {not in Vi} - {only used in Win32, Motif, GTK and Photon GUI} + {only used in Win32, Motif, and GTK} Some GUI versions allow the access to menu entries by using the ALT key in combination with a character that appears underlined in the menu. This conflicts with the use of the ALT key for mappings and diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 7ac0055321..40f30ff077 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -3741,7 +3741,7 @@ Win32 GUI: GUI: -8 Make inputdialog() work for Photon, Amiga. +8 Make inputdialog() work for Amiga. - cannot be mapped. Should be possible to recognize this as a normal "-" with the Ctrl modifier. 7 Implement ":popup" for other systems than Windows. diff --git a/runtime/menu.vim b/runtime/menu.vim index ba9250c0ba..09d3443155 100644 --- a/runtime/menu.vim +++ b/runtime/menu.vim @@ -383,7 +383,7 @@ if has("keymap") endif unlet s:n endif -if has("win32") || has("win16") || has("gui_motif") || has("gui_gtk") || has("gui_kde") || has("gui_photon") || has("gui_mac") +if has("win32") || has("win16") || has("gui_motif") || has("gui_gtk") || has("gui_kde") || has("gui_mac") an 20.470 &Edit.Select\ Fo&nt\.\.\. :set guifont=* endif 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 From f33abc4661d069727439958cedeaa4883ea3f298 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Tue, 9 Dec 2014 19:13:43 -0500 Subject: [PATCH 8/8] docs: Fix incorrect Mac path references --- runtime/doc/filetype.txt | 2 +- runtime/doc/os_mac.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 0a726072c5..2894814025 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -34,7 +34,7 @@ if you didn't do that already. Detail: The ":filetype on" command will load one of these files: Amiga $VIMRUNTIME/filetype.vim - Mac $VIMRUNTIME:filetype.vim + Mac $VIMRUNTIME/filetype.vim MS-DOS $VIMRUNTIME\filetype.vim Unix $VIMRUNTIME/filetype.vim VMS $VIMRUNTIME/filetype.vim diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt index 9ed23b4ae1..67790f1dea 100644 --- a/runtime/doc/os_mac.txt +++ b/runtime/doc/os_mac.txt @@ -54,7 +54,7 @@ algorithm is used: You can use the |$VIM| and |$VIMRUNTIME| variable. > - :so $VIMRUNTIME:syntax:syntax.vim + :so $VIMRUNTIME/syntax/syntax.vim ============================================================================== 2. .vimrc and .vim files *mac-vimfile*