[vim] - patchlevel 758

Karsten Hopp karsten at fedoraproject.org
Mon Jan 28 11:15:35 UTC 2013


commit 08872916c46aacb22a85c27e0f9da16efb4e642f
Author: Karsten Hopp <karsten at redhat.com>
Date:   Mon Jan 28 12:11:22 2013 +0100

    - patchlevel 758

 7.3.758 |   78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 78 insertions(+), 0 deletions(-)
---
diff --git a/7.3.758 b/7.3.758
new file mode 100644
index 0000000..49febd8
--- /dev/null
+++ b/7.3.758
@@ -0,0 +1,78 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.758
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.758
+Problem:    Matchit plugin does not handle space in #ifdef.
+Solution:   Change matching pattern to allow spaces. (Mike Morearty)
+Files:	    runtime/macros/matchit.vim
+
+
+*** ../vim-7.3.757/runtime/macros/matchit.vim	2010-08-15 21:57:19.000000000 +0200
+--- runtime/macros/matchit.vim	2012-12-12 16:34:11.000000000 +0100
+***************
+*** 131,137 ****
+      " let default = substitute(escape(&mps, '[$^.*~\\/?]'), '[,:]\+',
+      "  \ '\\|', 'g').'\|\/\*\|\*\/\|#if\>\|#ifdef\>\|#else\>\|#elif\>\|#endif\>'
+      let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
+!       \ '\/\*:\*\/,#if\%(def\)\=:#else\>:#elif\>:#endif\>'
+      " s:all = pattern with all the keywords
+      let match_words = match_words . (strlen(match_words) ? "," : "") . default
+      if match_words !~ s:notslash . '\\\d'
+--- 131,137 ----
+      " let default = substitute(escape(&mps, '[$^.*~\\/?]'), '[,:]\+',
+      "  \ '\\|', 'g').'\|\/\*\|\*\/\|#if\>\|#ifdef\>\|#else\>\|#elif\>\|#endif\>'
+      let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
+!       \ '\/\*:\*\/,#\s*if\%(def\)\=:#\s*else\>:#\s*elif\>:#\s*endif\>'
+      " s:all = pattern with all the keywords
+      let match_words = match_words . (strlen(match_words) ? "," : "") . default
+      if match_words !~ s:notslash . '\\\d'
+***************
+*** 649,655 ****
+    "   s:all	regexp based on s:pat and the default groups
+    " This part is copied and slightly modified from s:Match_wrapper().
+    let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
+!     \ '\/\*:\*\/,#if\%(def\)\=:#else\>:#elif\>:#endif\>'
+    " Allow b:match_words = "GetVimMatchWords()" .
+    if b:match_words =~ ":"
+      let match_words = b:match_words
+--- 649,655 ----
+    "   s:all	regexp based on s:pat and the default groups
+    " This part is copied and slightly modified from s:Match_wrapper().
+    let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
+!     \ '\/\*:\*\/,#\s*if\%(def\)\=:#\s*else\>:#\s*elif\>:#\s*endif\>'
+    " Allow b:match_words = "GetVimMatchWords()" .
+    if b:match_words =~ ":"
+      let match_words = b:match_words
+***************
+*** 808,812 ****
+--- 808,813 ----
+  endfun
+  
+  let &cpo = s:save_cpo
++ unlet s:save_cpo
+  
+  " vim:sts=2:sw=2:
+*** ../vim-7.3.757/src/version.c	2012-12-12 16:11:28.000000000 +0100
+--- src/version.c	2012-12-12 16:41:40.000000000 +0100
+***************
+*** 727,728 ****
+--- 727,730 ----
+  {   /* Add new patch number below this line */
++ /**/
++     758,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+147. You finally give up smoking...because it made the monitor dirty.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


More information about the scm-commits mailing list