diff options
| -rw-r--r-- | runtime/doc/cmdline.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/editing.txt | 123 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/index.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/insert.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/manpages/vim.1 | 3 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 52 | ||||
| -rw-r--r-- | runtime/doc/quickref.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/recover.txt | 38 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 16 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/undo.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/usr_11.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/usr_23.txt | 96 | ||||
| -rw-r--r-- | runtime/doc/usr_toc.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/various.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/vi_diff.txt | 2 | ||||
| -rw-r--r-- | runtime/optwin.vim | 2 | ||||
| -rw-r--r-- | runtime/syntax/vim.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test90.in | 2 |
20 files changed, 23 insertions, 340 deletions
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 2892faa496..77813423ba 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1053,7 +1053,6 @@ VARIOUS The command-line window cannot be used: - when there already is a command-line window (no nesting) -- for entering an encryption key or when using inputsecret() - when Vim was not compiled with the |+vertsplit| feature Some options are set when the command-line window is opened: diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index e4867e7a90..eeb4cde628 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -550,10 +550,6 @@ Before editing binary, executable or Vim script files you should set the option. This will avoid the use of 'fileformat'. Without this you risk that single <NL> characters are unexpectedly replaced with <CR><NL>. -You can encrypt files that are written by setting the 'key' option. This -provides some security against others reading your files. |encryption| - - ============================================================================== 3. The argument list *argument-list* *arglist* @@ -1356,119 +1352,12 @@ There are a few things to remember when editing binary files: ============================================================================== 9. Encryption *encryption* -Vim is able to write files encrypted, and read them back. The encrypted text -cannot be read without the right key. -{only available when compiled with the |+cryptv| feature} *E833* - -The text in the swap file and the undo file is also encrypted. *E843* -However, this is done block-by-block and may reduce the time needed to crack a -password. You can disable the swap file, but then a crash will cause you to -lose your work. The undo file can be disabled without much disadvantage. > - :set noundofile - :noswapfile edit secrets - -Note: The text in memory is not encrypted. A system administrator may be able -to see your text while you are editing it. When filtering text with -":!filter" or using ":w !command" the text is not encrypted, this may reveal -it to others. The 'viminfo' file is not encrypted. - -WARNING: If you make a typo when entering the key and then write the file and -exit, the text will be lost! - -The normal way to work with encryption, is to use the ":X" command, which will -ask you to enter a key. A following write command will use that key to -encrypt the file. If you later edit the same file, Vim will ask you to enter -a key. If you type the same key as that was used for writing, the text will -be readable again. If you use a wrong key, it will be a mess. - - *:X* -:X Prompt for an encryption key. The typing is done without showing the - actual text, so that someone looking at the display won't see it. - The typed key is stored in the 'key' option, which is used to encrypt - the file when it is written. The file will remain unchanged until you - write it. See also |-x|. - -The value of the 'key' options is used when text is written. When the option -is not empty, the written file will be encrypted, using the value as the -encryption key. A magic number is prepended, so that Vim can recognize that -the file is encrypted. - -To disable the encryption, reset the 'key' option to an empty value: > - :set key= - -You can use the 'cryptmethod' option to select the type of encryption, use one -of these two: > - :setlocal cm=zip " weak method, backwards compatible - :setlocal cm=blowfish " strong method -Do this before writing the file. When reading an encrypted file it will be -set automatically to the method used when that file was written. You can -change 'cryptmethod' before writing that file to change the method. -To set the default method, used for new files, use one of these in your -|vimrc| file: > - set cm=zip - set cm=blowfish -The message given for reading and writing a file will show "[crypted]" when -using zip, "[blowfish]" when using blowfish. - -When writing an undo file, the same key and method will be used for the text -in the undo file. |persistent-undo|. - - *E817* *E818* *E819* *E820* -When encryption does not work properly, you would be able to write your text -to a file and never be able to read it back. Therefore a test is performed to -check if the encryption works as expected. If you get one of these errors -don't write the file encrypted! You need to rebuild the Vim binary to fix -this. - -*E831* This is an internal error, "cannot happen". If you can reproduce it, -please report to the developers. - -When reading a file that has been encrypted and the 'key' option is not empty, -it will be used for decryption. If the value is empty, you will be prompted -to enter the key. If you don't enter a key, or you enter the wrong key, the -file is edited without being decrypted. There is no warning about using the -wrong key (this makes brute force methods to find the key more difficult). - -If want to start reading a file that uses a different key, set the 'key' -option to an empty string, so that Vim will prompt for a new one. Don't use -the ":set" command to enter the value, other people can read the command over -your shoulder. - -Since the value of the 'key' option is supposed to be a secret, its value can -never be viewed. You should not set this option in a vimrc file. - -An encrypted file can be recognized by the "file" command, if you add these -lines to "/etc/magic", "/usr/share/misc/magic" or wherever your system has the -"magic" file: > - 0 string VimCrypt~ Vim encrypted file - >9 string 01 - "zip" cryptmethod - >9 string 02 - "blowfish" cryptmethod - - -Notes: -- Encryption is not possible when doing conversion with 'charconvert'. -- Text you copy or delete goes to the numbered registers. The registers can - be saved in the .viminfo file, where they could be read. Change your - 'viminfo' option to be safe. -- Someone can type commands in Vim when you walk away for a moment, he should - not be able to get the key. -- If you make a typing mistake when entering the key, you might not be able to - get your text back! -- If you type the key with a ":set key=value" command, it can be kept in the - history, showing the 'key' value in a viminfo file. -- There is never 100% safety. The encryption in Vim has not been tested for - robustness. -- The algorithm used for 'cryptmethod' "zip" is breakable. A 4 character key - in about one hour, a 6 character key in one day (on a Pentium 133 PC). This - requires that you know some text that must appear in the file. An expert - can break it for any key. When the text has been decrypted, this also means - that the key can be revealed, and other files encrypted with the same key - can be decrypted. -- Pkzip uses the same encryption as 'cryptmethod' "zip", and US Govt has no - objection to its export. Pkzip's public file APPNOTE.TXT describes this - algorithm in detail. -- Vim originates from the Netherlands. That is where the sources come from. - Thus the encryption code is not exported from the USA. + *:X* *E817* *E818* *E819* *E820* +Support for editing encrypted files has been removed, but may be added back in +the future. See the following discussions for more information: + + https://github.com/neovim/neovim/issues/694 + https://github.com/neovim/neovim/issues/701 ============================================================================== 10. Timestamps *timestamp* *timestamps* diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 0778cf6122..ead25c6349 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -5604,7 +5604,6 @@ setwinvar({nr}, {varname}, {val}) *setwinvar()* sha256({string}) *sha256()* Returns a String with 64 hex charactes, which is the SHA256 checksum of {string}. - {only available when compiled with the |+cryptv| feature} shellescape({string} [, {special}]) *shellescape()* Escape {string} for use as a shell command argument. @@ -6681,7 +6680,6 @@ cmdline_hist Compiled with |cmdline-history| support. cmdline_info Compiled with 'showcmd' and 'ruler' support. comments Compiled with |'comments'| support. compatible Compiled to be very Vi compatible. -cryptv Compiled with encryption support |encryption|. cscope Compiled with |cscope| support. debug Compiled with "DEBUG" defined. dialog_con Compiled with console dialog support. diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 6792acd390..01ec37b5a0 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1072,7 +1072,6 @@ tag command action ~ |:@@| :@@ repeat the previous ":@" |:Next| :N[ext] go to previous file in the argument list |:Print| :P[rint] print lines -|:X| :X ask for encryption key |:append| :a[ppend] append text |:abbreviate| :ab[breviate] enter abbreviation |:abclear| :abc[lear] remove all abbreviations diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 60454fa8e1..8126a5b458 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1972,7 +1972,6 @@ self explanatory. Using the long or the short version depends on the possible [converted] conversion from 'fileencoding' to 'encoding' done - [crypted] file was decrypted [READ ERRORS] not all of the file could be read diff --git a/runtime/doc/manpages/vim.1 b/runtime/doc/manpages/vim.1 index 820caa24f5..59f21e1b9b 100644 --- a/runtime/doc/manpages/vim.1 +++ b/runtime/doc/manpages/vim.1 @@ -395,9 +395,6 @@ If the {scriptout} file exists, characters are appended. \-W {scriptout} Like \-w, but an existing file is overwritten. .TP -\-x -Use encryption when writing files. Will prompt for a crypt key. -.TP \-X Don't connect to the X server. Shortens startup time in a terminal, but the window title and clipboard will not be used. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 813ed83be4..5b55047c5f 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1413,9 +1413,6 @@ A jump table for the options with a short description can be found at |Q_op|. Note that v:fname_in and v:fname_out will never be the same. Note that v:charconvert_from and v:charconvert_to may be different from 'encoding'. Vim internally uses UTF-8 instead of UCS-2 or UCS-4. - Encryption is not done by Vim when using 'charconvert'. If you want - to encrypt the file after conversion, 'charconvert' should take care - of this. This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. @@ -2197,36 +2194,8 @@ A jump table for the options with a short description can be found at |Q_op|. variables overrule the terminal size values obtained with system specific functions. - *'cryptmethod'* *'cm'* -'cryptmethod' string (default "zip") - global or local to buffer |global-local| - {not in Vi} - Method used for encryption when the buffer is written to a file: - *pkzip* - zip PkZip compatible method. A weak kind of encryption. - Backwards compatible with Vim 7.2 and older. - *blowfish* - blowfish Blowfish method. Strong encryption. Requires Vim 7.3 - or later, files can NOT be read by Vim 7.2 and older. - This adds a "seed" to the file, every time you write - the file the encrypted bytes will be different. - - When reading an encrypted file 'cryptmethod' will be set automatically - to the detected method of the file being read. Thus if you write it - without changing 'cryptmethod' the same method will be used. - Changing 'cryptmethod' does not mark the file as modified, you have to - explicitly write it, you don't get a warning unless there are other - modifications. Also see |:X|. - - When setting the global value to an empty string, it will end up with - the value "zip". When setting the local value to an empty string the - buffer will use the global value. - - When a new encryption method is added in a later version of Vim, and - the current version does not recognize it, you will get *E821* . - You need to edit this file with the later version of Vim. - +'cryptmethod' Removed. {Nvim} *'cscopepathcomp'* *'cspc'* 'cscopepathcomp' 'cspc' number (default 0) @@ -4420,23 +4389,8 @@ A jump table for the options with a short description can be found at |Q_op|. Otherwise only one space is inserted. NOTE: This option is set when 'compatible' is set. - *'key'* -'key' string (default "") - local to buffer - {not in Vi} - {only available when compiled with the |+cryptv| - feature} - The key that is used for encrypting and decrypting the current buffer. - See |encryption| and 'cryptmethod'. - Careful: Do not set the key value by hand, someone might see the typed - key. Use the |:X| command. But you can make 'key' empty: > - :set key= -< It is not possible to get the value of this option with ":set key" or - "echo &key". This is to avoid showing it to someone who shouldn't - know. It also means you cannot see it yourself once you have set it, - be careful not to make a typing error! - You can use "&key" in an expression to detect whether encryption is - enabled. When 'key' is set it returns "*****" (five stars). + *'key'* +'key' Removed. {Nvim} *'keymap'* *'kmp'* *E544* 'keymap' 'kmp' string (default "") diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index a332b6fcc9..8b369baaa6 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -653,7 +653,6 @@ Short explanation of each option: *option-list* 'confirm' 'cf' ask what to do about unsaved/read-only files 'copyindent' 'ci' make 'autoindent' use existing indent structure 'cpoptions' 'cpo' flags for Vi-compatible behavior -'cryptmethod' 'cm' type of encryption to use for file writing 'cscopepathcomp' 'cspc' how many components of the path to show 'cscopeprg' 'csprg' command to execute cscope 'cscopequickfix' 'csqf' use quickfix window for cscope results @@ -756,7 +755,6 @@ Short explanation of each option: *option-list* 'iskeyword' 'isk' characters included in keywords 'isprint' 'isp' printable characters 'joinspaces' 'js' two spaces after a period with a join command -'key' encryption key 'keymap' 'kmp' name of a keyboard mapping 'keymodel' 'km' enable starting/stopping selection with keys 'keywordprg' 'kp' program to use for the "K" command diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt index 75318b00e6..89a773c409 100644 --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -196,42 +196,4 @@ will continue to get warning messages that the ".swp" file already exists. {Vi: recovers in another way and sends mail if there is something to recover} -ENCRYPTION AND THE SWAP FILE *:recover-crypt* - -When the text file is encrypted the swap file is encrypted as well. This -makes recovery a bit more complicated. When recovering from a swap file and -encryption has been used, you will be asked to enter one or two crypt keys. - -If the text file does not exist you will only be asked to enter the crypt key -for the swap file. - -If the text file does exist, it may be encrypted in a different way than the -swap file. You will be asked for the crypt key twice: - - Need encryption key for "/tmp/tt" ~ - Enter encryption key: ****** ~ - "/tmp/tt" [crypted] 23200L, 522129C ~ - Using swap file "/tmp/.tt.swp" ~ - Original file "/tmp/tt" ~ - Swap file is encrypted: "/tmp/.tt.swp" ~ - If you entered a new crypt key but did not write the text file, ~ - enter the new crypt key. ~ - If you wrote the text file after changing the crypt key press enter ~ - to use the same key for text file and swap file ~ - Enter encryption key: ~ - -You can be in one of these two situations: - -1. The encryption key was not changed, or after changing the key the text file - was written. You will be prompted for the crypt key twice. The second - time you can simply press Enter. That means the same key is used for the - text file and the swap file. -2. You entered a new encryption key, but did not save the text file. Vim will - then use the new key for the swap file, and the text file will still be - encrypted with the old key. At the second prompt enter the new key. - -Note that after recovery the key of the swap file will be used for the text -file. Thus if you write the text file, you need to use that new key. - - vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index d002a3a4ab..dbd87721fc 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -482,14 +482,6 @@ a slash. Thus "-R" means recovery and "-/R" readonly. ":rv" or ":wv" are used. See also |viminfo-file|. {not in Vi} - *-x* --x Use encryption to read/write files. Will prompt for a key, - which is then stored in the 'key' option. All writes will - then use this key to encrypt the text. The '-x' argument is - not needed when reading a file, because there is a check if - the file that is being read has been encrypted, and Vim asks - for a key automatically. |encryption| - *-X* -X Do not try connecting to the X server to get the current window title and copy/paste using the X clipboard. This @@ -1143,10 +1135,10 @@ vimrc file. These commands will write ":map" and ":set" commands to a file, in such a way that when these commands are executed, the current key mappings and options will be set to the same values. The options 'columns', 'endofline', -'fileformat', 'key', 'lines', 'modified', 'scroll', 'term', 'ttyfast' and -'ttymouse' are not included, because these are terminal or file dependent. -Note that the options 'binary', 'paste' and 'readonly' are included, this -might not always be what you want. +'fileformat', 'lines', 'modified', 'scroll', 'term', 'ttyfast' and 'ttymouse' +are not included, because these are terminal or file dependent. Note that the +options 'binary', 'paste' and 'readonly' are included, this might not always +be what you want. When special keys are used in mappings, The 'cpoptions' option will be temporarily set to its Vim default, to avoid the mappings to be diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 1cab028bc2..0743f2f208 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -3373,8 +3373,6 @@ Built-in script language: Patch by Ilya Sher, 2004 Mar 4. Return a list instead. char2hex() convert char string to hex string. - crypt() encrypt string - decrypt() decrypt string base64enc() base 64 encoding base64dec() base 64 decoding attributes() return file protection flags "drwxrwxrwx" diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt index 46469b3533..fba981d4a3 100644 --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -256,9 +256,6 @@ message about that when opening a file. Undo files are normally saved in the same directory as the file. This can be changed with the 'undodir' option. -When the file is encrypted, the text in the undo file is also crypted. The -same key and method is used. |encryption| - You can also save and restore undo histories by using ":wundo" and ":rundo" respectively: *:wundo* *:rundo* @@ -321,13 +318,6 @@ Reading an existing undo file may fail for several reasons: the undo file cannot be used, it would corrupt the text. This also happens when 'encoding' differs from when the undo file was written. *E825* The undo file does not contain valid contents and cannot be used. -*E826* The undo file is encrypted but decryption failed. -*E827* The undo file is encrypted but this version of Vim does not support - encryption. Open the file with another Vim. -*E832* The undo file is encrypted but 'key' is not set, the text file is not - encrypted. This would happen if the text file was written by Vim - encrypted at first, and later overwritten by not encrypted text. - You probably want to delete this undo file. "Not reading undo file, owner differs" The undo file is owned by someone else than the owner of the text file. For safety the undo file is not used. diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt index 9935ded48c..ec404f3301 100644 --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -283,8 +283,6 @@ machines. Therefore, don't rely on Vim always warning you. If you really don't want to see this message, you can add the 'A' flag to the 'shortmess' option. But it's very unusual that you need this. -For remarks about encryption and the swap file, see |:recover-crypt|. - ============================================================================== *11.4* Further reading diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt index 63cbc612de..0578a63ae5 100644 --- a/runtime/doc/usr_23.txt +++ b/runtime/doc/usr_23.txt @@ -6,15 +6,13 @@ This chapter is about editing files that are not ordinary files. With Vim you -can edit files that are compressed or encrypted. Some files need to be -accessed over the internet. With some restrictions, binary files can be -edited as well. +can edit files that are compressed. Some files need to be accessed over the +internet. With some restrictions, binary files can be edited as well. |23.1| DOS, Mac and Unix files |23.2| Files on the internet -|23.3| Encryption -|23.4| Binary files -|23.5| Compressed files +|23.3| Binary files +|23.4| Compressed files Next chapter: |usr_24.txt| Inserting quickly Previous chapter: |usr_22.txt| Finding the file to edit @@ -154,89 +152,7 @@ http://. For more information, also about passwords, see |netrw|. ============================================================================== -*23.3* Encryption - -Some information you prefer to keep to yourself. For example, when writing -a test on a computer that students also use. You don't want clever students -to figure out a way to read the questions before the exam starts. Vim can -encrypt the file for you, which gives you some protection. - To start editing a new file with encryption, use the "-x" argument to start -Vim. Example: > - - vim -x exam.txt - -Vim prompts you for a key used for encrypting and decrypting the file: - - Enter encryption key: ~ - -Carefully type the secret key now. You cannot see the characters you type, -they will be replaced by stars. To avoid the situation that a typing mistake -will cause trouble, Vim asks you to enter the key again: - - Enter same key again: ~ - -You can now edit this file normally and put in all your secrets. When you -finish editing the file and tell Vim to exit, the file is encrypted and -written. - When you edit the file with Vim, it will ask you to enter the same key -again. You don't need to use the "-x" argument. You can also use the normal -":edit" command. Vim adds a magic string to the file by which it recognizes -that the file was encrypted. - If you try to view this file using another program, all you get is garbage. -Also, if you edit the file with Vim and enter the wrong key, you get garbage. -Vim does not have a mechanism to check if the key is the right one (this makes -it much harder to break the key). - - -SWITCHING ENCRYPTION ON AND OFF - -To disable the encryption of a file, set the 'key' option to an empty string: -> - :set key= - -The next time you write the file this will be done without encryption. - Setting the 'key' option to enable encryption is not a good idea, because -the password appears in the clear. Anyone shoulder-surfing can read your -password. - To avoid this problem, the ":X" command was created. It asks you for an -encryption key, just like the "-x" argument did: > - - :X - Enter encryption key: ****** - Enter same key again: ****** - - -LIMITS ON ENCRYPTION - -The encryption algorithm used by Vim is weak. It is good enough to keep out -the casual prowler, but not good enough to keep out a cryptology expert with -lots of time on his hands. Also you should be aware that the swap file is not -encrypted; so while you are editing, people with superuser privileges can read -the unencrypted text from this file. - One way to avoid letting people read your swap file is to avoid using one. -If the -n argument is supplied on the command line, no swap file is used -(instead, Vim puts everything in memory). For example, to edit the encrypted -file "file.txt" without a swap file use the following command: > - - vim -x -n file.txt - -When already editing a file, the swapfile can be disabled with: > - - :setlocal noswapfile - -Since there is no swapfile, recovery will be impossible. Save the file a bit -more often to avoid the risk of losing your changes. - -While the file is in memory, it is in plain text. Anyone with privilege can -look in the editor's memory and discover the contents of the file. - If you use a viminfo file, be aware that the contents of text registers are -written out in the clear as well. - If you really want to secure the contents of a file, edit it only on a -portable computer not connected to a network, use good encryption tools, and -keep the computer locked up in a big safe when not in use. - -============================================================================== -*23.4* Binary files +*23.3* Binary files You can edit binary files with Vim. Vim wasn't really made for this, thus there are a few restrictions. But you can read a file, change a character and @@ -322,7 +238,7 @@ the right are ignored. See the manual page of xxd for more information. ============================================================================== -*23.5* Compressed files +*23.4* Compressed files This is easy: You can edit a compressed file just like any other file. The "gzip" plugin takes care of decompressing the file when you edit it. And diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt index d98a999aa4..9e4bf5ca93 100644 --- a/runtime/doc/usr_toc.txt +++ b/runtime/doc/usr_toc.txt @@ -198,9 +198,8 @@ Subjects that can be read independently. |usr_23.txt| Editing other files |23.1| DOS, Mac and Unix files |23.2| Files on the internet - |23.3| Encryption - |23.4| Binary files - |23.5| Compressed files + |23.3| Binary files + |23.4| Compressed files |usr_24.txt| Inserting quickly |24.1| Making corrections diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index c3c4ed7cfe..6f639e0fe9 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -319,7 +319,6 @@ N *+cmdline_hist* command line history |cmdline-history| N *+cmdline_info* |'showcmd'| and |'ruler'| N *+comments* |'comments'| support B *+conceal* "conceal" support, see |conceal| |:syn-conceal| etc. -N *+cryptv* encryption support |encryption| B *+cscope* |cscope| support m *+cursorbind* |'cursorbind'| support m *+cursorshape* |termcap-cursor-shape| support diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index aa90dc94b0..e15a7b75fe 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -939,8 +939,6 @@ Only Vim is able to accept options in between and after the file names. -W {name} Vim: Append to script file {name}. --x Vi, Vim: Ask for encryption key. See |encryption|. - -X Vim: Don't connect to the X server. -y Vim: Start in easy mode, like |evim|. diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 22581ed98b..40498f61b2 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -992,8 +992,6 @@ if !has("msdos") call append("$", "\t(local to buffer)") call <SID>BinOptionL("sn") endif -call append("$", "cryptmethod\tencryption method for file writing: zip or blowfish") -call append("$", "\t(local to buffer)") call <SID>OptionL("cm") diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index c8aebd4bb2..2c2db44333 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -30,7 +30,7 @@ syn keyword vimStdPlugin contained DiffOrig Man N[ext] P[rint] S TOhtml XMLent X syn keyword vimOption contained acd ambiwidth arabicshape autowriteall backupdir bdlay binary breakat bufhidden cd ci cinw co commentstring confirm cpoptions cscoperelative csre cursorcolumn delcombine diffopt ea efm ep et fdc fdo ffs filetype fo foldlevelstart formatexpr ft gfw gtt guipty hh hkmap ic imaf iminsert includeexpr inf isident key langmap lines lmap ma matchtime mco ml modeline mousefocus mousetime nrformats ofu para pdev pi previewwindow printmbfont qe relativenumber rightleftcmd ru sbr scrolloff selection shellcmdflag shellxescape showbreak si smartcase softtabstop spelllang sps sta su swb synmaxcol tagbsearch tbi termencoding thesaurus titlestring tpm ttm ttytype undodir ut vfile vop wcm whichwrap wildignore winaltkeys winminwidth wmnu write syn keyword vimOption contained ai ambw ari aw backupext beval brk buflisted cdpath cin cinwords cocu compatible cpt cscopetag cst cursorline dex digraph ead ei equalalways eventignore fde fdt fic fillchars foldclose foldmarker formatlistpat gcr ghr guicursor guitablabel hi hkmapp icon imak ims incsearch infercase isk keymap langmenu linespace loadplugins macatsui maxcombine mef mls modelines mousehide mp nu omnifunc paragraphs penc pm printdevice printoptions quoteescape remap rl ruf sc scrollopt selectmode shellpipe shellxquote showcmd sidescroll smartindent sol spellsuggest sr stal sua swf syntax taglength tbidi terse tildeop tl tr tty tw undofile vb vi wa wd wi wildignorecase window winwidth wmw writeany 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 cryptmethod 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 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 sn 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 shortname shq sm so spellfile spr st sts swapsync syn tag tb termbidi tgst titleold top ttimeoutlen ttyscroll ul ur unnamedclip unc verbosefile visualbell diff --git a/src/nvim/testdir/test90.in b/src/nvim/testdir/test90.in index 6bac414f31..3c0d8c030c 100644 --- a/src/nvim/testdir/test90.in +++ b/src/nvim/testdir/test90.in @@ -2,7 +2,7 @@ Tests for sha256() function. vim: set ft=vim et ts=2 sw=2 : STARTTEST :so small.vim -:if !has('cryptv') || !exists('*sha256') +:if !exists('*sha256') e! test.ok wq! test.out :endif |