mirror of
https://github.com/zoriya/vim.git
synced 2026-06-06 21:23:57 +00:00
After recovery check if the text changed. If it did mark the buffer as
modified.
This commit is contained in:
+18
-18
@@ -1148,8 +1148,25 @@ Patch for adding "J" flag to 'cinoptions': placement of jump label.
|
||||
|
||||
|
||||
Vim 7.3:
|
||||
Patches to include:
|
||||
- Add patch for 'relativenumber' option? Markus Heidelberg, 2008 Jun 27.
|
||||
Update 2010 May 2.
|
||||
- Add blowfish encryption. Openssl has an implementation. Also by Paul
|
||||
Kocher (LGPL), close to original. Mohsin also has some ideas.
|
||||
Take four bytes and turn them into unsigned to avoid byte-order problems.
|
||||
Need to buffer up to 7 bytes to align on 8 byte boundaries.
|
||||
Patch from Moshin: 2010 May 8, addition May 9.
|
||||
- gettabvar() and settabvar() functions. (Yegappan Lakshmanan, 2010 May 14)
|
||||
- Patch to support netbeans in Unix console Vim. (Xavier de Gaye, 2009 Apr
|
||||
26) Now with Mercurial repository (2010 Jan 2)
|
||||
- Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25)
|
||||
- Gvimext patch to support wide file names. (Szabolcs Horvat 2008 Sep 10)
|
||||
- Patch to support netbeans for Mac. (Kazuki Sakamoto, 2009 Jun 25)
|
||||
- Patch to support clipboard for Mac terminal. (Jjgod Jiang, 2009 Aug 1)
|
||||
- Patch to support :browse for more commands. (Lech Lorens, 2009 Jul 18)
|
||||
- Patch to add diff functionality to 2html.vim. (Christian Brabandt, 2009 Dec
|
||||
15)
|
||||
Needs some work:
|
||||
- Use NSIS 2.45, it includes Windows 7 support.
|
||||
Include "RequestExecutionLevel highest"
|
||||
Ron's version: http://dev.ronware.org/p/vim/finfo?name=gvim.nsi
|
||||
@@ -1169,28 +1186,11 @@ Vim 7.3:
|
||||
before some time/date can be flushed. 'undopersist' gives maximum time to
|
||||
keep undo: "3h", "1d", "2w", "1y", etc. For the file use dot and
|
||||
extension: ".filename.un~" (like swapfile but "un~" instead of "swp").
|
||||
- Add blowfish encryption. Openssl has an implementation. Also by Paul
|
||||
Kocher (LGPL), close to original. Mohsin also has some ideas.
|
||||
Take four bytes and turn them into unsigned to avoid byte-order problems.
|
||||
Need to buffer up to 7 bytes to align on 8 byte boundaries.
|
||||
Patch from Moshin: 2010 May 8, addition May 9.
|
||||
- gettabvar() and settabvar() functions. (Yegappan Lakshmanan, 2010 May 14)
|
||||
- Patch to support netbeans in Unix console Vim. (Xavier de Gaye, 2009 Apr
|
||||
26) Now with Mercurial repository (2010 Jan 2)
|
||||
- ":{range}source": source the lines from the current file.
|
||||
You can already yank lines and use :@" to execute them.
|
||||
Most of do_source() would not be used, need a new function.
|
||||
It's easy when not doing breakpoints or profiling.
|
||||
- Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25)
|
||||
- Gvimext patch to support wide file names. (Szabolcs Horvat 2008 Sep 10)
|
||||
- Patch to support netbeans for Mac. (Kazuki Sakamoto, 2009 Jun 25)
|
||||
- Patch to support clipboard for Mac terminal. (Jjgod Jiang, 2009 Aug 1)
|
||||
- Patch to support :browse for more commands. (Lech Lorens, 2009 Jul 18)
|
||||
- Patch to add diff functionality to 2html.vim. (Christian Brabandt, 2009 Dec
|
||||
15)
|
||||
- After using ":recover" or recovering a file in another way, ":x" doesn't
|
||||
save what you see. Mark the buffer as modified? Only when the text is
|
||||
actually different from the original file.
|
||||
Before (beta) release:
|
||||
- Add fixes for 7.2 to version7.txt
|
||||
|
||||
|
||||
|
||||
+24
-8
@@ -29,29 +29,45 @@ with the "-r" argument added: >
|
||||
vim -r help.txt
|
||||
|
||||
Vim will read the swap file (used to store text you were editing) and may read
|
||||
bits and pieces of the original file. If all is well, you will see these
|
||||
messages (with different file names, of course):
|
||||
bits and pieces of the original file. If Vim recovered your changes you will
|
||||
see these messages (with different file names, of course):
|
||||
|
||||
Using swap file ".help.txt.swp" ~
|
||||
Original file "~/vim/runtime/doc/help.txt" ~
|
||||
Recovery completed. You should check if everything is OK. ~
|
||||
(You might want to write out this file under another name ~
|
||||
and run diff with the original file to check for changes) ~
|
||||
Delete the .swp file afterwards. ~
|
||||
You may want to delete the .swp file now. ~
|
||||
|
||||
To be on the safe side, write this file under another name: >
|
||||
|
||||
:write help.txt.recovered
|
||||
|
||||
Compare the file with the original file to check if you ended up with what you
|
||||
expected. Vimdiff is very useful for this |08.7|. Watch out for the original
|
||||
file to contain a more recent version (you saved the file just before the
|
||||
computer crashed). And check that no lines are missing (something went wrong
|
||||
that Vim could not recover).
|
||||
expected. Vimdiff is very useful for this |08.7|. For example: >
|
||||
|
||||
:write help.txt.recovered
|
||||
:edit #
|
||||
:diffsp help.txt
|
||||
|
||||
Watch out for the original file to contain a more recent version (you saved
|
||||
the file just before the computer crashed). And check that no lines are
|
||||
missing (something went wrong that Vim could not recover).
|
||||
If Vim produces warning messages when recovering, read them carefully.
|
||||
This is rare though.
|
||||
|
||||
It's normal that the last few changes can not be recovered. Vim flushes the
|
||||
If the recovery resulted in text that is exactly the same as the file
|
||||
contents, you will get this message:
|
||||
|
||||
Using swap file ".help.txt.swp" ~
|
||||
Original file "~/vim/runtime/doc/help.txt" ~
|
||||
Recovery completed. Buffer contents equals file contents. ~
|
||||
You may want to delete the .swp file now. ~
|
||||
|
||||
This usually happens if you already recovered your changes, or you wrote the
|
||||
file after making changes. It is safe to delete the swap file now.
|
||||
|
||||
It is normal that the last few changes can not be recovered. Vim flushes the
|
||||
changes to disk when you don't type for about four seconds, or after typing
|
||||
about two hundred characters. This is set with the 'updatetime' and
|
||||
'updatecount' options. Thus when Vim didn't get a chance to save itself when
|
||||
|
||||
@@ -7161,6 +7161,11 @@ Changed *changed-7.3*
|
||||
The extra and language files are no longer distributed separately.
|
||||
The files for all systems are included in one distribution.
|
||||
|
||||
After using ":recover" or recovering a file in another way, ":x" and "ZZ"
|
||||
don't save what you see. This could result in work being lost. Now the text
|
||||
after recovery is compared to the original file contents. When they differ
|
||||
the buffer is marked as modified.
|
||||
|
||||
|
||||
Added *added-7.3*
|
||||
-----
|
||||
|
||||
Reference in New Issue
Block a user