lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
8c7d886
To: vim_dev@googlegroups.com
8c7d886
Subject: Patch 7.4.170
8c7d886
Fcc: outbox
8c7d886
From: Bram Moolenaar <Bram@moolenaar.net>
8c7d886
Mime-Version: 1.0
8c7d886
Content-Type: text/plain; charset=UTF-8
8c7d886
Content-Transfer-Encoding: 8bit
8c7d886
------------
8c7d886
8c7d886
Patch 7.4.170
8c7d886
Problem:    Some help tags don't work with ":help". (Tim Chase)
8c7d886
Solution:   Add exceptions.
8c7d886
Files:	    src/ex_cmds.c
8c7d886
8c7d886
8c7d886
*** ../vim-7.4.169/src/ex_cmds.c	2013-11-09 03:31:45.000000000 +0100
8c7d886
--- src/ex_cmds.c	2014-02-11 12:10:43.905946437 +0100
8c7d886
***************
8c7d886
*** 5936,5949 ****
8c7d886
  			       "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
8c7d886
  			       "/\\?", "/\\z(\\)", "\\=", ":s\\=",
8c7d886
  			       "[count]", "[quotex]", "[range]",
8c7d886
! 			       "[pattern]", "\\|", "\\%$"};
8c7d886
      static char *(rtable[]) = {"star", "gstar", "[star", "]star", ":star",
8c7d886
  			       "/star", "/\\\\star", "quotestar", "starstar",
8c7d886
  			       "cpo-star", "/\\\\(\\\\)", "/\\\\%(\\\\)",
8c7d886
  			       "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
8c7d886
  			       "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
8c7d886
  			       "\\[count]", "\\[quotex]", "\\[range]",
8c7d886
! 			       "\\[pattern]", "\\\\bar", "/\\\\%\\$"};
8c7d886
      int flags;
8c7d886
  
8c7d886
      d = IObuff;		    /* assume IObuff is long enough! */
8c7d886
--- 5936,5953 ----
8c7d886
  			       "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
8c7d886
  			       "/\\?", "/\\z(\\)", "\\=", ":s\\=",
8c7d886
  			       "[count]", "[quotex]", "[range]",
8c7d886
! 			       "[pattern]", "\\|", "\\%$",
8c7d886
! 			       "s/\\~", "s/\\U", "s/\\L",
8c7d886
! 			       "s/\\1", "s/\\2", "s/\\3", "s/\\9"};
8c7d886
      static char *(rtable[]) = {"star", "gstar", "[star", "]star", ":star",
8c7d886
  			       "/star", "/\\\\star", "quotestar", "starstar",
8c7d886
  			       "cpo-star", "/\\\\(\\\\)", "/\\\\%(\\\\)",
8c7d886
  			       "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
8c7d886
  			       "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
8c7d886
  			       "\\[count]", "\\[quotex]", "\\[range]",
8c7d886
! 			       "\\[pattern]", "\\\\bar", "/\\\\%\\$",
8c7d886
!                                "s/\\\\\\~", "s/\\\\U", "s/\\\\L",
8c7d886
! 			       "s/\\\\1", "s/\\\\2", "s/\\\\3", "s/\\\\9"};
8c7d886
      int flags;
8c7d886
  
8c7d886
      d = IObuff;		    /* assume IObuff is long enough! */
8c7d886
***************
8c7d886
*** 5982,5988 ****
8c7d886
  	  /* Replace:
8c7d886
  	   * "[:...:]" with "\[:...:]"
8c7d886
  	   * "[++...]" with "\[++...]"
8c7d886
! 	   * "\{" with "\\{"
8c7d886
  	   */
8c7d886
  	    if ((arg[0] == '[' && (arg[1] == ':'
8c7d886
  			 || (arg[1] == '+' && arg[2] == '+')))
8c7d886
--- 5986,5992 ----
8c7d886
  	  /* Replace:
8c7d886
  	   * "[:...:]" with "\[:...:]"
8c7d886
  	   * "[++...]" with "\[++...]"
8c7d886
! 	   * "\{" with "\\{"               -- matching "} \}"
8c7d886
  	   */
8c7d886
  	    if ((arg[0] == '[' && (arg[1] == ':'
8c7d886
  			 || (arg[1] == '+' && arg[2] == '+')))
8c7d886
*** ../vim-7.4.169/src/version.c	2014-02-05 22:46:49.062587842 +0100
8c7d886
--- src/version.c	2014-02-11 11:41:50.433919875 +0100
8c7d886
***************
8c7d886
*** 740,741 ****
8c7d886
--- 740,743 ----
8c7d886
  {   /* Add new patch number below this line */
8c7d886
+ /**/
8c7d886
+     170,
8c7d886
  /**/
8c7d886
8c7d886
-- 
8c7d886
   GALAHAD turns back.  We see from his POV the lovely ZOOT standing by him
8c7d886
   smiling enchantingly and a number of equally delectable GIRLIES draped
8c7d886
   around in the seductively poulticed room.  They look at him smilingly and
8c7d886
   wave.
8c7d886
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
8c7d886
8c7d886
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8c7d886
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8c7d886
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
8c7d886
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///