updated for version 7.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.

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 9cf1287a4847334474f835261fb8b771bde084f9..249dafb5868ce423e28d6e76405a5da831b0d334 100644 (file)
--- 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 296d3de9456dc57eafe4ef6243e0b333fc895295..ec61f9bd3345d04ebfb92874e0ec532c4830dcc6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    686,
 /**/
     685,
 /**/