summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-23 16:16:19 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-23 16:16:19 +0200
commitede3e6383d0bc86c13f039e9013ff72e307937d2 (patch)
tree5de5db06e4245eaccc4f3880bb10e5bb76352aac
parent6f1404f8a8d00f7aa9accf4fc8a5a48857454a4a (diff)
downloadvim-git-ede3e6383d0bc86c13f039e9013ff72e307937d2.tar.gz
updated for version 7.3.1235v7.3.1235
Problem: In insert mode CTRL-] is not inserted, on the command-line it is. Solution: Don't insert CTRL-] on the command line. (Yukihiro Nakadaira)
-rw-r--r--src/ex_getln.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index e407ab0ae..ec64619e4 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1700,13 +1700,13 @@ getcmdline(firstc, count, indent)
* We come here if we have a normal character.
*/
- if (do_abbr && (IS_SPECIAL(c) || !vim_iswordc(c)) && ccheck_abbr(
+ if (do_abbr && (IS_SPECIAL(c) || !vim_iswordc(c)) && (ccheck_abbr(
#ifdef FEAT_MBYTE
/* Add ABBR_OFF for characters above 0x100, this is
* what check_abbr() expects. */
(has_mbyte && c >= 0x100) ? (c + ABBR_OFF) :
#endif
- c))
+ c) || c == Ctrl_RSB))
goto cmdline_changed;
/*
diff --git a/src/version.c b/src/version.c
index cde6db8ca..2f24c3f44 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1235,
+/**/
1234,
/**/
1233,