aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/screen.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/screen.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/screen.c')
-rw-r--r--src/nvim/screen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index b0109b0824..e5e4a850df 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -6412,7 +6412,7 @@ int showmode(void)
|| restart_edit
|| VIsual_active
));
- if (do_mode || Recording) {
+ if (do_mode || reg_recording != 0) {
/*
* Don't show mode right now, when not redrawing or inside a mapping.
* Call char_avail() only when we are going to show something, because
@@ -6533,7 +6533,7 @@ int showmode(void)
need_clear = TRUE;
}
- if (Recording
+ if (reg_recording != 0
&& edit_submode == NULL /* otherwise it gets too long */
) {
recording_mode(attr);
@@ -6600,7 +6600,7 @@ void clearmode(void)
{
msg_ext_ui_flush();
msg_pos_mode();
- if (Recording) {
+ if (reg_recording != 0) {
recording_mode(HL_ATTR(HLF_CM));
}
msg_clr_eos();
@@ -6612,7 +6612,7 @@ static void recording_mode(int attr)
MSG_PUTS_ATTR(_("recording"), attr);
if (!shortmess(SHM_RECORDING)) {
char_u s[4];
- vim_snprintf((char *)s, ARRAY_SIZE(s), " @%c", Recording);
+ snprintf((char *)s, ARRAY_SIZE(s), " @%c", reg_recording);
MSG_PUTS_ATTR(s, attr);
}
}