summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-10-11 04:04:37 +0200
committerBram Moolenaar <Bram@vim.org>2012-10-11 04:04:37 +0200
commitb73568149f2f41a84b9b701ae512adbd79b2e93b (patch)
tree7f94d128cf4bae404a895faa69af3812c7536acf
parent0c17875ef31e7e8b3f16e1b2e8da263c9a420b8b (diff)
updated for version 7.3.686v7.3.686
Problem: Using CTRL-\ e mappings is useful also when entering an expression, but it doesn't work. (Marcin Szamotulski) Solution: Allow using CTRL-\ e when entering an expression if it was not typed.
-rw-r--r--src/ex_getln.c7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 9cf1287a48..249dafb586 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -667,9 +667,10 @@ getcmdline(firstc, count, indent)
c = plain_vgetc();
--no_mapping;
--allow_keys;
- /* CTRL-\ e doesn't work when obtaining an expression. */
- if (c != Ctrl_N && c != Ctrl_G
- && (c != 'e' || ccline.cmdfirstc == '='))
+ /* 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)))
{
vungetc(c);
c = Ctrl_BSL;
diff --git a/src/version.c b/src/version.c
index 296d3de945..ec61f9bd33 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 686,
+/**/
685,
/**/
684,