summaryrefslogtreecommitdiff
path: root/src/screen.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-11-19 17:56:13 +0100
committerBram Moolenaar <Bram@vim.org>2015-11-19 17:56:13 +0100
commita0ed84a26897c994512873a895b9fc54e90c6845 (patch)
tree0ca54e1951f994c1d373a225fa9a537e14045f5a /src/screen.c
parent32d03b34ac8a34a962f57847fc431a2b4e14efea (diff)
downloadvim-git-a0ed84a26897c994512873a895b9fc54e90c6845.tar.gz
patch 7.4.925v7.4.925
Problem: User may yank or put using the register being recorded in. Solution: Add the recording register in the message. (Christian Brabandt, closes #470)
Diffstat (limited to 'src/screen.c')
-rw-r--r--src/screen.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/screen.c b/src/screen.c
index de9e04df6..d80ad6f96 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -163,6 +163,7 @@ static void redraw_block __ARGS((int row, int end, win_T *wp));
static int win_do_lines __ARGS((win_T *wp, int row, int line_count, int mayclear, int del));
static void win_rest_invalid __ARGS((win_T *wp));
static void msg_pos_mode __ARGS((void));
+static void recording_mode __ARGS((int attr));
#if defined(FEAT_WINDOWS)
static void draw_tabline __ARGS((void));
#endif
@@ -10163,7 +10164,7 @@ showmode()
#endif
)
{
- MSG_PUTS_ATTR(_("recording"), attr);
+ recording_mode(attr);
need_clear = TRUE;
}
@@ -10227,11 +10228,24 @@ unshowmode(force)
{
msg_pos_mode();
if (Recording)
- MSG_PUTS_ATTR(_("recording"), hl_attr(HLF_CM));
+ recording_mode(hl_attr(HLF_CM));
msg_clr_eos();
}
}
+ static void
+recording_mode(attr)
+ int attr;
+{
+ MSG_PUTS_ATTR(_("recording"), attr);
+ if (!shortmess(SHM_RECORDING))
+ {
+ char_u s[4];
+ sprintf((char *)s, " @%c", Recording);
+ MSG_PUTS_ATTR(s, attr);
+ }
+}
+
#if defined(FEAT_WINDOWS)
/*
* Draw the tab pages line at the top of the Vim window.