From 5d8d24f0c238a1ac8f7bf3a1e5d74447b8be36d0 Mon Sep 17 00:00:00 2001
From: Jurica Bradarić <jbradaric@users.noreply.github.com>
Date: Sun, 4 Sep 2016 03:30:36 +0200
Subject: vim-patch:7.4.1900 (#5259)

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

https://github.com/vim/vim/commit/28b942a064dd486cc241894b625ab72f5a5c6d1b
---
 src/nvim/ex_cmds.c                     | 13 ++++++++-----
 src/nvim/testdir/test_help_tagjump.vim | 10 ++++++++++
 src/nvim/version.c                     |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index e70ec9ab8a..3dcd9a9116 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -4563,12 +4563,15 @@ int find_help_tags(char_u *arg, int *num_matches, char_u ***matches, int keep_la
           break;
         }
 
-        /*
-         * If tag starts with ', toss everything after a second '. Fixes
-         * CTRL-] on 'option'. (would include the trailing '.').
-         */
-        if (*s == '\'' && s > arg && *arg == '\'')
+        // If tag starts with ', toss everything after a second '. Fixes
+        // CTRL-] on 'option'. (would include the trailing '.').
+        if (*s == '\'' && s > arg && *arg == '\'') {
           break;
+        }
+        // Also '{' and '}'. Fixes CTRL-] on '{address}'.
+        if (*s == '}' && s > arg && *arg == '{') {
+          break;
+        }
       }
       *d = NUL;
 
diff --git a/src/nvim/testdir/test_help_tagjump.vim b/src/nvim/testdir/test_help_tagjump.vim
index 9f9207d27d..42f8391aba 100644
--- a/src/nvim/testdir/test_help_tagjump.vim
+++ b/src/nvim/testdir/test_help_tagjump.vim
@@ -37,4 +37,14 @@ 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
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 464039241e..d37eec1c28 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -376,7 +376,7 @@ static int included_patches[] = {
   // 1903,
   // 1902 NA
   // 1901 NA
-  // 1900,
+  1900,
   // 1899 NA
   1898,
   // 1897,
-- 
cgit