diff options
Diffstat (limited to 'runtime/doc/recover.txt')
| -rw-r--r-- | runtime/doc/recover.txt | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt index 75318b00e6..570340cf0c 100644 --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -33,20 +33,13 @@ with the extension ".swp". - On Unix, a '.' is prepended to swap file names in the same directory as the edited file. This avoids that the swap file shows up in a directory listing. -- On MS-DOS machines and when the 'shortname' option is on, any '.' in the - original file name is replaced with '_'. - If this file already exists (e.g., when you are recovering from a crash) a warning is given and another extension is used, ".swo", ".swn", etc. - An existing file will never be overwritten. - The swap file is deleted as soon as Vim stops editing the file. -Technical: The replacement of '.' with '_' is done to avoid problems with - MS-DOS compatible filesystems (e.g., crossdos, multidos). If Vim - is able to detect that the file is on an MS-DOS-like filesystem, a - flag is set that has the same effect as the 'shortname' option. - This flag is reset when you start editing another file. *E326* - If the ".swp" file name already exists, the last character is +Technical: If the ".swp" file name already exists, the last character is decremented until there is no file with that name or ".saa" is reached. In the last case, no swap file is created. @@ -196,42 +189,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: |