diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2015-04-05 12:42:23 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2015-04-05 12:42:23 +0200 |
| commit | 5e67f0b5b152c6e79268cdfbfdd310738adc22fb (patch) | |
| tree | e427da7ecc32909e3ef31f97b3bb3b146f1fad84 /src/nvim/ex_docmd.c | |
| parent | 73bf0551f891a13d76f436bf6a26933089539fa9 (diff) | |
| parent | adcf268a72827be38510b1830b67b287dec50c4a (diff) | |
| download | rneovim-5e67f0b5b152c6e79268cdfbfdd310738adc22fb.tar.gz rneovim-5e67f0b5b152c6e79268cdfbfdd310738adc22fb.tar.bz2 rneovim-5e67f0b5b152c6e79268cdfbfdd310738adc22fb.zip | |
Merge pull request #2244 from bfredl/registers
Restore clipboard support for `:registers` and `:put` and `:<c-r>*`, don't clobber `"0` on paste and update tests.
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index db4f3a54f1..cf22477dc9 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -1699,16 +1699,11 @@ static char_u * do_one_cmd(char_u **cmdlinep, } /* accept numbered register only when no count allowed (:put) */ - if ( (ea.argt & REGSTR) - && *ea.arg != NUL - /* Do not allow register = for user commands */ - && (!IS_USER_CMDIDX(ea.cmdidx) || *ea.arg != '=') - && !((ea.argt & COUNT) && VIM_ISDIGIT(*ea.arg))) { - /* check these explicitly for a more specific error message */ - if (*ea.arg == '*' || *ea.arg == '+') { - errormsg = (char_u *)_(e_invalidreg); - goto doend; - } + if ((ea.argt & REGSTR) + && *ea.arg != NUL + /* Do not allow register = for user commands */ + && (!IS_USER_CMDIDX(ea.cmdidx) || *ea.arg != '=') + && !((ea.argt & COUNT) && VIM_ISDIGIT(*ea.arg))) { if (valid_yank_reg(*ea.arg, (ea.cmdidx != CMD_put && !IS_USER_CMDIDX(ea.cmdidx)))) { ea.regname = *ea.arg++; |