summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-04 22:31:27 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-04 22:31:27 +0200
commit28b942a064dd486cc241894b625ab72f5a5c6d1b (patch)
tree67e521ca9c1dc67d7948bf27f18f1f4cce12fa47 /src
parent8e31fd52ec8be6ef1dc600b637d5f099d55e1715 (diff)
downloadvim-git-28b942a064dd486cc241894b625ab72f5a5c6d1b.tar.gz
patch 7.4.1900v7.4.1900
Problem: Using CTRL-] in the help on "{address}." doesn't work. Solution: Recognize an item in {}. (Hirohito Higashi, closes #814)
Diffstat (limited to 'src')
-rw-r--r--src/ex_cmds.c3
-rw-r--r--src/testdir/test_help_tagjump.vim10
-rw-r--r--src/version.c2
3 files changed, 15 insertions, 0 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index d83dc405c..12764b408 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -6216,6 +6216,9 @@ find_help_tags(
*/
if (*s == '\'' && s > arg && *arg == '\'')
break;
+ /* Also '{' and '}'. */
+ if (*s == '}' && s > arg && *arg == '{')
+ break;
}
*d = NUL;
diff --git a/src/testdir/test_help_tagjump.vim b/src/testdir/test_help_tagjump.vim
index 62076c39e..0f14ade6b 100644
--- a/src/testdir/test_help_tagjump.vim
+++ b/src/testdir/test_help_tagjump.vim
@@ -25,6 +25,16 @@ func Test_help_tagjump()
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*arglistid()\*')
helpclose
+
+ exec "help! 'autoindent'."
+ call assert_equal("help", &filetype)
+ call assert_true(getline('.') =~ "\\*'autoindent'\\*")
+ helpclose
+
+ exec "help! {address}."
+ call assert_equal("help", &filetype)
+ call assert_true(getline('.') =~ '\*{address}\*')
+ helpclose
endfunc
let s:langs = ['en', 'ab', 'ja']
diff --git a/src/version.c b/src/version.c
index b1f4fe462..adbf0edd4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1900,
+/**/
1899,
/**/
1898,