patch 7.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)
diff --git a/src/ops.c b/src/ops.c
index 62d88a7..d099580 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -1080,7 +1080,7 @@
retval = FAIL;
else
{
- Recording = TRUE;
+ Recording = c;
showmode();
regname = c;
retval = OK;
diff --git a/src/option.h b/src/option.h
index f872836..c6a3e60 100644
--- a/src/option.h
+++ b/src/option.h
@@ -213,7 +213,8 @@
#define SHM_ATTENTION 'A' /* no ATTENTION messages */
#define SHM_INTRO 'I' /* intro messages */
#define SHM_COMPLETIONMENU 'c' /* completion menu messages */
-#define SHM_ALL "rmfixlnwaWtToOsAIc" /* all possible flags for 'shm' */
+#define SHM_RECORDING 'q' /* short recording message */
+#define SHM_ALL "rmfixlnwaWtToOsAIcq" /* all possible flags for 'shm' */
/* characters for p_go: */
#define GO_ASEL 'a' /* autoselect */
diff --git a/src/screen.c b/src/screen.c
index de9e04d..d80ad6f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -163,6 +163,7 @@
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 @@
#endif
)
{
- MSG_PUTS_ATTR(_("recording"), attr);
+ recording_mode(attr);
need_clear = TRUE;
}
@@ -10227,11 +10228,24 @@
{
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.
diff --git a/src/version.c b/src/version.c
index e3742cc..5633841 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 925,
+/**/
924,
/**/
923,