--- a/components/vim/patches/vim-help.patch	Tue Oct 04 15:53:56 2016 -0700
+++ b/components/vim/patches/vim-help.patch	Mon Sep 26 21:06:11 2016 -0700
@@ -1,15 +1,15 @@
---- src/ex_cmds.c	Thu Apr 21 16:23:08 2011
-+++ src/ex_cmds.c	Thu Apr 21 16:23:08 2011
-@@ -5525,6 +5525,8 @@
-     int		len;
-     char_u	*lang;
+--- a/src/ex_cmds.c	2016-09-21 15:16:13.032570431 -0700
++++ b/src/ex_cmds.c	2016-09-21 15:16:13.055466074 -0700
+@@ -6276,6 +6276,8 @@
+ #ifdef FEAT_FOLDING
+     int		old_KeyTyped = KeyTyped;
  #endif
 +    int		nohelp = FALSE, nominhelp = FALSE;
 +    char_u	*mhf = NULL;
  
      if (eap != NULL)
      {
-@@ -5576,6 +5578,23 @@
+@@ -6327,6 +6329,23 @@
      n = find_help_tags(arg, &num_matches, &matches,
  						 eap != NULL && eap->forceit);
  
@@ -33,7 +33,7 @@
      i = 0;
  #ifdef FEAT_MULTI_LANG
      if (n != FAIL && lang != NULL)
-@@ -5588,7 +5607,7 @@
+@@ -6339,7 +6358,7 @@
  		break;
  	}
  #endif
@@ -42,7 +42,7 @@
      {
  #ifdef FEAT_MULTI_LANG
  	if (lang != NULL)
-@@ -5601,9 +5620,11 @@
+@@ -6352,9 +6371,11 @@
  	return;
      }
  
@@ -57,7 +57,7 @@
  
  #ifdef FEAT_GUI
      need_mouse_correct = TRUE;
-@@ -5635,12 +5656,14 @@
+@@ -6386,12 +6407,14 @@
  	     * There is no help window yet.
  	     * Try to open the file specified by the "helpfile" option.
  	     */
@@ -77,7 +77,7 @@
  
  #ifdef FEAT_WINDOWS
  	    /* Split off help window; put it at far top if no position
-@@ -5671,7 +5694,7 @@
+@@ -6420,7 +6443,7 @@
  	     * Set the alternate file to the previously edited file.
  	     */
  	    alt_fnum = curbuf->b_fnum;
@@ -86,16 +86,16 @@
  			  ECMD_HIDE + ECMD_SET_HELP,
  #ifdef FEAT_WINDOWS
  			  NULL  /* buffer is still open, don't store info */
-@@ -5688,7 +5711,7 @@
-     if (!p_im)
- 	restart_edit = 0;	    /* don't want insert mode in help file */
+@@ -6443,7 +6466,7 @@
+     KeyTyped = old_KeyTyped;
+ #endif
  
 -    if (tag != NULL)
 +    if (!nohelp && tag != NULL)
  	do_tag(tag, DT_HELP, 1, FALSE, TRUE);
  
      /* Delete the empty buffer if we're not using it.  Careful: autocommands
-@@ -5706,7 +5729,8 @@
+@@ -6461,7 +6484,8 @@
  	curwin->w_alt_fnum = alt_fnum;
  
  erret:
@@ -104,4 +104,4 @@
 +	vim_free(tag);
  }
  
- 
+ /*