vim-patch:7.4.1568

patch 7.4.1568
Problem:    Using CTRL-] in help on option in parentheses doesn't work.
Solution:   Skip the "(" in "('". (Hirohito Higashi)

https://github.com/vim/vim/commit/00f9e0dbbd3472db217d56639fad9346b9eb3b82

2 files changed, 14 insertions, 11 deletions

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index e8314e02e0..b87e02b51a 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -4413,17 +4413,20 @@ int find_help_tags(char_u *arg, int *num_matches, char_u ***matches, int keep_la
           || (arg[0] == '\\' && arg[1] == '{'))
         *d++ = '\\';
 
-      for (s = arg; *s; ++s) {
-        /*
-         * Replace "|" with "bar" and '"' with "quote" to match the name of
-         * the tags for these commands.
-         * Replace "*" with ".*" and "?" with "." to match command line
-         * completion.
-         * Insert a backslash before '~', '$' and '.' to avoid their
-         * special meaning.
-         */
-        if (d - IObuff > IOSIZE - 10)           /* getting too long!? */
+      // If tag starts with "('", skip the "(". Fixes CTRL-] on ('option'.
+      if (*arg == '(' && arg[1] == '\'') {
+          arg++;
+      }
+      for (s = arg; *s; s++) {
+        // Replace "|" with "bar" and '"' with "quote" to match the name of
+        // the tags for these commands.
+        // Replace "*" with ".*" and "?" with "." to match command line
+        // completion.
+        // Insert a backslash before '~', '$' and '.' to avoid their
+        // special meaning.
+        if (d - IObuff > IOSIZE - 10) {           // getting too long!?
           break;
+        }
         switch (*s) {
         case '|':   STRCPY(d, "bar");
           d += 3;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 7ee3b596de..74822c308f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -114,7 +114,7 @@ static int included_patches[] = {
   // 1571,
   1570,
   1569,
-  // 1568,
+  1568,
   // 1567,
   // 1566 NA
   // 1565,