diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2015-04-17 23:05:26 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2015-04-17 23:05:26 +0200 |
| commit | a88e2f4fd4c3e10aabd41e758cc845332be013da (patch) | |
| tree | 817480a6c2d859fb46cffe59a7e61590501653aa /src/nvim/ex_docmd.c | |
| parent | 607a118de4eb36bd10d86234238ff3debc0032c0 (diff) | |
| parent | 26fedb133d817274a9f4bf54f97d3e5adfba67b4 (diff) | |
| download | rneovim-a88e2f4fd4c3e10aabd41e758cc845332be013da.tar.gz rneovim-a88e2f4fd4c3e10aabd41e758cc845332be013da.tar.bz2 rneovim-a88e2f4fd4c3e10aabd41e758cc845332be013da.zip | |
Merge pull request #2411 from bfredl/yankregs
Cleanup implementation of registers and fix missing clipboard support in `:redir`
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index f7f6b84e6e..0bcc4a35ff 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -6487,7 +6487,7 @@ static void ex_operators(exarg_T *eap) case CMD_yank: oa.op_type = OP_YANK; - (void)op_yank(&oa, FALSE, TRUE); + (void)op_yank(&oa, true); break; default: /* CMD_rshift or CMD_lshift */ @@ -6515,7 +6515,7 @@ static void ex_put(exarg_T *eap) eap->forceit = TRUE; } curwin->w_cursor.lnum = eap->line2; - do_put(eap->regname, eap->forceit ? BACKWARD : FORWARD, 1L, + do_put(eap->regname, NULL, eap->forceit ? BACKWARD : FORWARD, 1L, PUT_LINE|PUT_CURSLINE); } @@ -6738,8 +6738,7 @@ static void ex_redir(exarg_T *eap) /* redirect to a register a-z (resp. A-Z for appending) */ close_redir(); ++arg; - if (ASCII_ISALPHA(*arg) - || *arg == '"') { + if (valid_yank_reg(*arg, true) && *arg != '_') { redir_reg = *arg++; if (*arg == '>' && arg[1] == '>') /* append */ arg += 2; |