summaryrefslogtreecommitdiff
path: root/src/normal.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-05-22 20:35:17 +0200
committerBram Moolenaar <Bram@vim.org>2018-05-22 20:35:17 +0200
commit0b6d911e5de1a1c10a23d4c2ee1b0275c474a2dd (patch)
tree3d33047a64f47e30852f5d6f187f316d12b3f55b /src/normal.c
parentb4518563c73460150344a57879bf5b22cb8b1c77 (diff)
downloadvim-git-0b6d911e5de1a1c10a23d4c2ee1b0275c474a2dd.tar.gz
patch 8.1.0020: cannot tell whether a register is executing or recordingv8.1.0020
Problem: Cannot tell whether a register is being used for executing or recording. Solution: Add reg_executing() and reg_recording(). (Hirohito Higashi, closes #2745) Rename the global variables for consistency. Store the register name in reg_executing.
Diffstat (limited to 'src/normal.c')
-rw-r--r--src/normal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/normal.c b/src/normal.c
index 3b958a5b5..58f7a7a96 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -871,8 +871,8 @@ getcount:
|| (nv_cmds[idx].cmd_flags & NV_NCH_ALW) == NV_NCH_ALW
|| (ca.cmdchar == 'q'
&& oap->op_type == OP_NOP
- && !Recording
- && !Exec_reg)
+ && reg_recording == 0
+ && reg_executing == 0)
|| ((ca.cmdchar == 'a' || ca.cmdchar == 'i')
&& (oap->op_type != OP_NOP || VIsual_active))))
{
@@ -9324,7 +9324,7 @@ nv_record(cmdarg_T *cap)
#endif
/* (stop) recording into a named register, unless executing a
* register */
- if (!Exec_reg && do_record(cap->nchar) == FAIL)
+ if (reg_executing == 0 && do_record(cap->nchar) == FAIL)
clearopbeep(cap->oap);
}
}