diff options
| author | Bram Moolenaar <bram@vim.org> | 2012-10-11 04:04:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2012-10-11 04:04:37 +0200 |
| commit | 608b2ba4ce56340c12b62fc3469bee9875145915 (patch) | |
| tree | 72709ecd2a0da51f098de8dfbdf2034b0a221212 | |
| parent | d1804a8f46ad22fd54675354304b7afa7f89c9a8 (diff) | |
| download | vim-608b2ba4ce56340c12b62fc3469bee9875145915.tar.gz | |
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.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 9cf1287a..249dafb5 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 296d3de9..ec61f9bd 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, |