aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ops.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-05-26 19:39:38 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-05-26 20:24:11 -0400
commit21f160746a4b406f84311a64fff96c1bd52f23c9 (patch)
tree20b69ca7e01201f0a68d2a1d22db8a4377411cc0 /src/nvim/ops.c
parentfb4d5a184678ab231da20ef559c8e423dfa54d6e (diff)
downloadrneovim-21f160746a4b406f84311a64fff96c1bd52f23c9.tar.gz
rneovim-21f160746a4b406f84311a64fff96c1bd52f23c9.tar.bz2
rneovim-21f160746a4b406f84311a64fff96c1bd52f23c9.zip
vim-patch:8.1.0020: cannot tell whether a register is executing or recording
Problem: Cannot tell whether a register is being used for executing or recording. Solution: Add reg_executing() and reg_recording(). (Hirohito Higashi, closes vim/vim#2745) Rename the global variables for consistency. Store the register name in reg_executing. https://github.com/vim/vim/commit/0b6d911e5de1a1c10a23d4c2ee1b0275c474a2dd
Diffstat (limited to 'src/nvim/ops.c')
-rw-r--r--src/nvim/ops.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 1c5d4e98a7..9b68b713ad 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -852,13 +852,13 @@ int do_record(int c)
yankreg_T *old_y_previous;
int retval;
- if (Recording == false) {
+ if (reg_recording == 0) {
// start recording
// registers 0-9, a-z and " are allowed
if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) {
retval = FAIL;
} else {
- Recording = c;
+ reg_recording = c;
showmode();
regname = c;
retval = OK;
@@ -869,7 +869,7 @@ int do_record(int c)
* needs to be removed again to put it in a register. exec_reg then
* adds the escaping back later.
*/
- Recording = false;
+ reg_recording = 0;
if (ui_has(kUIMessages)) {
showmode();
} else {
@@ -1040,7 +1040,7 @@ do_execreg(
== FAIL)
return FAIL;
}
- Exec_reg = TRUE; /* disable the 'q' command */
+ reg_executing = regname == 0 ? '"' : regname; // disable the 'q' command
}
return retval;
}