summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-09-25 20:48:57 +0200
committerBram Moolenaar <Bram@vim.org>2018-09-25 20:48:57 +0200
commit31cbadf74bccc2a5cd8233bc31bbcfe466b00021 (patch)
treed6a2d087667e6cb4a650cd791945e35f8d11f387
parent45c5c86e636edef8ed08d47bf8724efc05108030 (diff)
downloadvim-git-8.1.0433.tar.gz
patch 8.1.0433: mapping can obtain text from inputsecret()v8.1.0433
Problem: Mapping can obtain text from inputsecret(). (Tommy Allen) Solution: Disallow CTRL-R = and CTRL-\ e when using inputsecret().
-rw-r--r--src/ex_getln.c9
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index c2c74534b..f08ae9032 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1308,7 +1308,11 @@ getcmdline(
/* CTRL-\ e doesn't work when obtaining an expression, unless it
* is in a mapping. */
if (c != Ctrl_N && c != Ctrl_G && (c != 'e'
- || (ccline.cmdfirstc == '=' && KeyTyped)))
+ || (ccline.cmdfirstc == '=' && KeyTyped)
+#ifdef FEAT_EVAL
+ || cmdline_star
+#endif
+ ))
{
vungetc(c);
c = Ctrl_BSL;
@@ -1801,7 +1805,8 @@ getcmdline(
new_cmdpos = -1;
if (c == '=')
{
- if (ccline.cmdfirstc == '=')/* can't do this recursively */
+ if (ccline.cmdfirstc == '=' // can't do this recursively
+ || cmdline_star) // or when typing a password
{
beep_flush();
c = ESC;
diff --git a/src/version.c b/src/version.c
index a009ef099..6c69b17d6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 433,
+/**/
432,
/**/
431,