diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-12-12 18:20:32 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-12-12 18:20:32 +0100 |
| commit | ba6e85855634a16481e0fe7dd7ba9adf2ede201a (patch) | |
| tree | 4949d228dd6d0a834fdc530f93a12577148e67dc /src | |
| parent | 83dadafdd7967ba2d57b343e24119d6ff17b190c (diff) | |
| download | vim-git-ba6e85855634a16481e0fe7dd7ba9adf2ede201a.tar.gz | |
updated for version 7.3.761v7.3.761
Problem: In Visual mode a "-p does not work. (Marcin Szamotulski)
Solution: Avoid writing to "- before putting it. (Christian Brabandt)
Diffstat (limited to 'src')
| -rw-r--r-- | src/normal.c | 5 | ||||
| -rw-r--r-- | src/testdir/test48.in | 4 | ||||
| -rw-r--r-- | src/testdir/test48.ok | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/normal.c b/src/normal.c index 869ada37a..4d0bbdbea 100644 --- a/src/normal.c +++ b/src/normal.c @@ -9412,14 +9412,15 @@ nv_put(cap) # ifdef FEAT_CLIPBOARD adjust_clip_reg(®name); # endif - if (regname == 0 || regname == '"' || VIM_ISDIGIT(regname) + if (regname == 0 || regname == '"' + || VIM_ISDIGIT(regname) || regname == '-' # ifdef FEAT_CLIPBOARD || (clip_unnamed && (regname == '*' || regname == '+')) # endif ) { - /* the delete is going to overwrite the register we want to + /* The delete is going to overwrite the register we want to * put, save it first. */ reg1 = get_register(regname, TRUE); } diff --git a/src/testdir/test48.in b/src/testdir/test48.in index 2179fe664..48f4abbf7 100644 --- a/src/testdir/test48.in +++ b/src/testdir/test48.in @@ -54,8 +54,12 @@ $5lrxa<-- should be 'x' ^O3li4li4li <-- should show the name of a noted text editor ^o4li4li4li <-- and its version number-dd :" +:" Test for yanking and pasting using the small delete register +gg/^foo +dewve"-p :wq! test.out ENDTEST +foo, bar keyword keyw all your base are belong to us 1 2 3 4 5 6 diff --git a/src/testdir/test48.ok b/src/testdir/test48.ok index 4fcbe5086..334cb5a29 100644 --- a/src/testdir/test48.ok +++ b/src/testdir/test48.ok @@ -1,3 +1,4 @@ +, foo keyword keyword all your base are belong to vim diff --git a/src/version.c b/src/version.c index 3f889b6ab..5e7b39706 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 761, +/**/ 760, /**/ 759, |