patch 7.4.1900

Problem:    Using CTRL-] in the help on "{address}." doesn't work.
Solution:   Recognize an item in {}. (Hirohito Higashi, closes #814)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index d83dc405c7a8e9fb6949d78defce44b8363460c1..12764b408edb7f37bc5633194c6cde0cbbfecf8b 100644 (file)
--- 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 62076c39e8e11f38e2b63870459050a59b20a2ff..0f14ade6baea0d1f86f8479365507cda468242e9 100644 (file)
--- 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 b1f4fe462c8b7907b30c0ad951814ba8971d225c..adbf0edd41f0f8bcece2c6e007205a5a89091e85 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1900,
 /**/
     1899,
 /**/