aacafc0
To: vim-dev@vim.org
aacafc0
Subject: Patch 7.0.046
aacafc0
Fcc: outbox
aacafc0
From: Bram Moolenaar <Bram@moolenaar.net>
aacafc0
Mime-Version: 1.0
aacafc0
Content-Type: text/plain; charset=ISO-8859-1
aacafc0
Content-Transfer-Encoding: 8bit
aacafc0
------------
aacafc0
aacafc0
Patch 7.0.046
aacafc0
Problem:    The matchparen plugin ignores parens in strings, but not in single
aacafc0
	    quotes, often marked with "character".
aacafc0
Solution:   Also ignore parens in syntax items matching "character".
aacafc0
Files:	    runtime/plugin/matchparen.vim
aacafc0
aacafc0
aacafc0
*** ../vim-7.0.045/runtime/plugin/matchparen.vim	Sat May 13 14:52:02 2006
aacafc0
--- runtime/plugin/matchparen.vim	Mon Jun 26 10:53:35 2006
aacafc0
***************
aacafc0
*** 1,6 ****
aacafc0
  " Vim plugin for showing matching parens
aacafc0
  " Maintainer:  Bram Moolenaar <Bram@vim.org>
aacafc0
! " Last Change: 2006 May 11
aacafc0
  
aacafc0
  " Exit quickly when:
aacafc0
  " - this plugin was already loaded (or disabled)
aacafc0
--- 1,6 ----
aacafc0
  " Vim plugin for showing matching parens
aacafc0
  " Maintainer:  Bram Moolenaar <Bram@vim.org>
aacafc0
! " Last Change: 2006 Jun 26
aacafc0
  
aacafc0
  " Exit quickly when:
aacafc0
  " - this plugin was already loaded (or disabled)
aacafc0
***************
aacafc0
*** 96,102 ****
aacafc0
  
aacafc0
    " When not in a string or comment ignore matches inside them.
aacafc0
    let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
aacafc0
! 	\ '=~?  "string\\|comment"'
aacafc0
    execute 'if' s_skip '| let s_skip = 0 | endif'
aacafc0
  
aacafc0
    let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
aacafc0
--- 96,102 ----
aacafc0
  
aacafc0
    " When not in a string or comment ignore matches inside them.
aacafc0
    let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
aacafc0
! 	\ '=~?  "string\\|character\\|singlequote\\|comment"'
aacafc0
    execute 'if' s_skip '| let s_skip = 0 | endif'
aacafc0
  
aacafc0
    let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
aacafc0
*** ../vim-7.0.045/src/version.c	Tue Aug  8 17:06:21 2006
aacafc0
--- src/version.c	Tue Aug  8 18:07:37 2006
aacafc0
***************
aacafc0
*** 668,669 ****
aacafc0
--- 668,671 ----
aacafc0
  {   /* Add new patch number below this line */
aacafc0
+ /**/
aacafc0
+     46,
aacafc0
  /**/
aacafc0
aacafc0
-- 
aacafc0
I AM THANKFUL...
aacafc0
...for the taxes that I pay because it means that I am employed.
aacafc0
aacafc0
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
aacafc0
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
aacafc0
\\\        download, build and distribute -- http://www.A-A-P.org        ///
aacafc0
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///