Mercurial > vim
comparison src/normal.c @ 14004:e124262d435e v8.1.0020
patch 8.1.0020: cannot tell whether a register is executing or recording
commit https://github.com/vim/vim/commit/0b6d911e5de1a1c10a23d4c2ee1b0275c474a2dd
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue May 22 20:35:17 2018 +0200
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 #2745) Rename the global variables for consistency. Store
the register name in reg_executing.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 22 May 2018 20:45:05 +0200 |
| parents | 156ebdcb8ef5 |
| children | dc67449d648c |
comparison
equal
deleted
inserted
replaced
| 14003:3965a5a6215e | 14004:e124262d435e |
|---|---|
| 869 && (((nv_cmds[idx].cmd_flags & NV_NCH_NOP) == NV_NCH_NOP | 869 && (((nv_cmds[idx].cmd_flags & NV_NCH_NOP) == NV_NCH_NOP |
| 870 && oap->op_type == OP_NOP) | 870 && oap->op_type == OP_NOP) |
| 871 || (nv_cmds[idx].cmd_flags & NV_NCH_ALW) == NV_NCH_ALW | 871 || (nv_cmds[idx].cmd_flags & NV_NCH_ALW) == NV_NCH_ALW |
| 872 || (ca.cmdchar == 'q' | 872 || (ca.cmdchar == 'q' |
| 873 && oap->op_type == OP_NOP | 873 && oap->op_type == OP_NOP |
| 874 && !Recording | 874 && reg_recording == 0 |
| 875 && !Exec_reg) | 875 && reg_executing == 0) |
| 876 || ((ca.cmdchar == 'a' || ca.cmdchar == 'i') | 876 || ((ca.cmdchar == 'a' || ca.cmdchar == 'i') |
| 877 && (oap->op_type != OP_NOP || VIsual_active)))) | 877 && (oap->op_type != OP_NOP || VIsual_active)))) |
| 878 { | 878 { |
| 879 int *cp; | 879 int *cp; |
| 880 int repl = FALSE; /* get character for replace mode */ | 880 int repl = FALSE; /* get character for replace mode */ |
| 9322 } | 9322 } |
| 9323 else | 9323 else |
| 9324 #endif | 9324 #endif |
| 9325 /* (stop) recording into a named register, unless executing a | 9325 /* (stop) recording into a named register, unless executing a |
| 9326 * register */ | 9326 * register */ |
| 9327 if (!Exec_reg && do_record(cap->nchar) == FAIL) | 9327 if (reg_executing == 0 && do_record(cap->nchar) == FAIL) |
| 9328 clearopbeep(cap->oap); | 9328 clearopbeep(cap->oap); |
| 9329 } | 9329 } |
| 9330 } | 9330 } |
| 9331 | 9331 |
| 9332 /* | 9332 /* |