aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Odding <peter@peterodding.com>2013-08-31 15:30:27 +0200
committerPeter Odding <peter@peterodding.com>2013-08-31 15:30:27 +0200
commit330ec57f84b46268ef5b5ddb21ec2d9a660750d2 (patch)
tree54c8bb3ecc970441b0038a0b11b7c29e5aa49a09
parenteae3e06cbbf8a2fd8e8818c53f964e68e76f3171 (diff)
parente79da3eff3ee3c8af0953052dfa58b4aee96fd15 (diff)
downloadvim-easytags-330ec57f84b46268ef5b5ddb21ec2d9a660750d2.tar.gz
Merge pull request #63: fix 'multiple repeat' error from regex for c++ filetypes
See pull request #63 on GitHub: https://github.com/xolox/vim-easytags/pull/63
-rw-r--r--autoload/xolox/easytags.vim4
-rw-r--r--misc/easytags/highlight.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/autoload/xolox/easytags.vim b/autoload/xolox/easytags.vim
index aa65770..e201f70 100644
--- a/autoload/xolox/easytags.vim
+++ b/autoload/xolox/easytags.vim
@@ -1,9 +1,9 @@
" Vim script
" Author: Peter Odding <peter@peterodding.com>
-" Last Change: August 19, 2013
+" Last Change: August 31, 2013
" URL: http://peterodding.com/code/vim/easytags/
-let g:xolox#easytags#version = '3.4.1'
+let g:xolox#easytags#version = '3.4.2'
" Plug-in initialization. {{{1
diff --git a/misc/easytags/highlight.py b/misc/easytags/highlight.py
index 154854e..6053726 100644
--- a/misc/easytags/highlight.py
+++ b/misc/easytags/highlight.py
@@ -5,7 +5,7 @@ syntax highlighting by reimplementing tag file reading and :syntax command
generation in Python with a focus on doing the least amount of work.
Author: Peter Odding <peter@peterodding.com>
-Last Change: October 29, 2011
+Last Change: August 31, 2013
URL: http://peterodding.com/code/vim/easytags
'''
@@ -23,7 +23,7 @@ def easytags_gensyncmd(tagsfiles, filetype, tagkinds, syntaxgroup, prefix, suffi
if filters:
tagkinds = filters['kind']
# Shallow parse tags files for matching identifiers.
- pattern = '^([^\t]+)\t[^\t]+\t[^\t]+\t' + tagkinds + '\tlanguage:' + filetype
+ pattern = '^([^\t]+)\t[^\t]+\t[^\t]+\t' + tagkinds + '\tlanguage:' + re.escape(filetype)
compiled_pattern = re.compile(pattern, re.IGNORECASE)
matches = {}
for fname in tagsfiles: