Permalink
Browse files

Update version, docs and README

  • Loading branch information...
1 parent c347f3f commit a2bc1b6d1b9c67503dabfe4fa0ba03458cc0d42c @maxbrunsfeld committed Jul 2, 2012
Showing with 22 additions and 18 deletions.
  1. +8 −10 README.md
  2. +4 −1 autoload/yankstack.vim
  3. +10 −7 doc/yankstack.txt
View
@@ -28,6 +28,9 @@ By default, yankstack adds only 2 key bindings, in normal and visual modes:
After pasting some text using ```p``` or ```P```, you can cycle through your
yank history using these commands.
+Typing either of these keys *without* pasting first will do a normal paste
+(the same as typing `p`). This also works in insert mode.
+
A note about the meta key - if you're using MacVim, and you want to use
this plugin's default key bindings (or any bindings involving the `option`
key), you must ```:set macmeta```
@@ -39,12 +42,11 @@ Its output is similar to the ```:registers``` command.
## Configuration ##
-Yankstack defines three plugin mappings that you can map to keys of your choosing.
+Yankstack defines two plugin mappings that you can map to keys of your choosing.
The same mappings work in normal and insert modes.
- ```<Plug>yankstack_substitute_older_paste``` - cycle backwards through your history of yanks
- ```<Plug>yankstack_substitute_newer_paste``` - cycle forwards through your history of yanks
-- ```<Plug>yankstack_insert_mode_paste``` - paste in insert mode such that yankstack will register the paste
For example, if you wanted to define some mappings based on your 'leader' key,
you could do this:
@@ -54,14 +56,6 @@ nmap <leader>p <Plug>yankstack_substitute_older_paste
nmap <leader>P <Plug>yankstack_substitute_older_paste
```
-Or, if you wanted to define emacs style bindings in insert mode, you could do this:
-
-```
-imap <C-y> <Plug>yankstack_insert_mode_paste
-imap <M-y> <Plug>yankstack_substitute_older_paste
-imap <M-Y> <Plug>yankstack_substitute_older_paste
-```
-
Also, if you want to load yankstack without the default key mappings, just
``` let g:yankstack_map_keys = 0 ```
in your .vimrc file.
@@ -90,6 +84,10 @@ Check it out on [github](https://github.com/maxbrunsfeld/vim-yankstack)!
## Changelog ##
+### 1.0.4 (2012-07-01)
+ - Make it so that yankstack-cycling keys cause a normal paste if they are
+ used without pasting first. Fix stack-cycling in insert-mode.
+
### 1.0.3 (2012-05-04):
- Fix bug when overwriting text in select mode. This was causing
problems for snipMate users.
View
@@ -1,9 +1,12 @@
" yankstack.vim - keep track of your history of yanked/killed text
"
" Maintainer: Max Brunsfeld <https://github.com/maxbrunsfeld>
-" Version: 1.0.3
+" Version: 1.0.4
" Todo:
"
+" - fix cursor placement after multiline pastes with `meta-p`
+" in insert mode
+"
let s:yankstack_tail = []
let g:yankstack_size = 30
View
@@ -37,6 +37,9 @@ meta-shift-p cycle forwards through your history of yanks
After pasting some text using |p| or |P|, you can cycle through your
yank history using these commands.
+Typing either of these keys without pasting first will do a normal paste
+(the same as typing `p`). This also works in insert mode.
+
A note about the meta key - if you're using MacVim, and you want to use
this plugin's default key bindings (or any bindings involving the `option`
key), you must :set |macmeta|.
@@ -63,19 +66,15 @@ choosing. The same mappings work in normal and insert modes.
Mapping Name Action ~
<Plug>yankstack_substitute_older_paste cycle BACKWARDs through your history of yanks
<Plug>yankstack_substitute_newer_paste cycle FORWARDS through your history of yanks
-<Plug>yankstack_insert_mode_paste paste in insert mode such that yankstack will register the paste
For example, if you wanted to define some mappings based on your |leader| key, you could do this: >
nmap <leader>p <Plug>yankstack_substitute_older_paste
nmap <leader>P <Plug>yankstack_substitute_older_paste
-Or, if you wanted to define emacs-style bindings in insert mode, you could do
-this: >
-
- imap <C-y> <Plug>yankstack_insert_mode_paste
- imap <M-y> <Plug>yankstack_substitute_older_paste
- imap <M-Y> <Plug>yankstack_substitute_newer_paste
+Also, if you want to load yankstack without the default key mappings, just
+``` let g:yankstack_map_keys = 0 ```
+in your .vimrc file.
COMPATIBILITY *yankstack-compatibility*
@@ -92,6 +91,10 @@ mappings of your own. To achieve this, just call 'yankstack#setup()'in your
CHANGELOG *yankstack-changelog*
+1.0.4 (2012-07-01)
+ - Make it so that yankstack-cycling keys cause a normal paste if they are
+ used without pasting first. Fix stack-cycling in insert-mode.
+
1.0.3 (2012-05-04):
- Fix bug when overwriting text in select mode. This was causing
problems for snipMate users.

0 comments on commit a2bc1b6

Please sign in to comment.