Permalink
Browse files

Version 4.2: Fixed some small issue.

  • Loading branch information...
1 parent b3bd58b commit 33f87e810465b19ac2c4a846e9eb0b7cff35cc40 @mbbill mbbill committed with Nov 24, 2012
Showing with 10 additions and 15 deletions.
  1. +9 −8 README.md
  2. +1 −1 plugin/undotree.vim
  3. +0 −6 syntax/undotree.vim
View
@@ -14,27 +14,28 @@ Now this plug-in will free you from those commands and bring back the power of u
* The current position is marked as **>seq<**.
* The next change that will be restored by `:redo` or `<ctrl-r>` is marked as **{seq}**, it's the same as *curhead* returned by *undotree()*
* The **[seq]** marks the last change and where further changes will be added, it's the same as *newhead* returned by *undotree()*
- * Saved changes are marked as **s** and the current change is **S**
+ * Saved changes are marked as **s** and the capitalized **S** indicates the last saved change.
1. Live updated diff panel.
- 1. Highlight changed text.
- 1. Revert to a specific change by mouse click or enter key.
- 1. Hotkey support.
+ 1. Highlight for changed text.
+ 1. Revert to a specific change by a single mouse click or key stroke.
+ 1. Customizable hotkeys.
1. Display changes in diff panel.
### [Download](https://github.com/mbbill/undotree/tags)
### Install
- 1. Unpack all scripts into *plugin* directory and that's all. This script is written purely in Vim script with no additional dependency.
+ 1. Unpack all scripts into *.vim* directory and that's all. This script is written purely in Vim script with no additional dependency.
+ 1. It's highly recommend using **pathogen** or **Vundle** to manage your plug-ins.
### Usage
1. Use `:UndotreeToggle` to toggle the undo-tree panel. You may want to map this command to whatever hotkey by adding the following line to your vimrc, take F5 for example.
- nnoremap <F5> :UndotreeToggle<cr>
+ nnoremap &lt;F5&gt; :UndotreeToggle&lt;cr&gt;
1. Then you can try to do some modification, and the undo tree will automatically updated afterwards.
1. There are a bunch of hotkeys provided by vim to switch between the changes in history, like `u`, `<ctrl-r>`, `g+`, `g-` as well as the `:earlier` and `:later` commands.
1. You may also switch to undotree panel and use the hotkeys to switch between history versions. Press `?` in undotree window for quick help of hotkeys.
- 1. You can monitor the changed text in diff panel which is automatically updated with undotree panel.
+ 1. You can monitor the changed text in diff panel which is automatically updated when undo/redo happens.
1. Persistent undo
* It is highly recommend to enable the persistent undo. If you don't like your working directory be messed up with the undo file everywhere.
@@ -74,4 +75,4 @@ Someone asked me about the difference with [Gundo](http://sjl.bitbucket.org/gund
**BSD**
### Author
-Ming Bai `<mbbill AT gmail DOT COM>`
+Ming Bai &lt;mbbill AT gmail DOT COM&gt;
View
@@ -26,7 +26,7 @@ if !exists('g:undotree_TreeNodeShape')
let g:undotree_TreeNodeShape = '*'
endif
-" split window location, could also be topright
+" split window location, could also be botright,
if !exists('g:undotree_SplitLocation')
let g:undotree_SplitLocation = 'topleft'
endif
View
@@ -4,10 +4,6 @@
" Author: Ming Bai <mbbill@gmail.com>
" License: BSD
-if exists("b:undotree_syntax")
- finish
-endif
-
syn match UndotreeNode ' \zs\*\ze '
syn match UndotreeNodeCurrent '\zs\*\ze.*>\d\+<'
syn match UndotreeTimeStamp '(.*)$'
@@ -38,6 +34,4 @@ hi link UndotreeHelpTitle Type
hi link UndotreeSavedSmall WarningMsg
hi link UndotreeSavedBig MatchParen
-let b:undotree_syntax = 'undotree'
-
" vim: set et fdm=marker sts=4 sw=4:

0 comments on commit 33f87e8

Please sign in to comment.