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