diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | autoload.vim | 17 |
2 files changed, 5 insertions, 19 deletions
@@ -1,5 +1,6 @@ -DEPENDS=$(HOME)/.vim/autoload/xolox/escape.vim \ - $(HOME)/.vim/autoload/xolox/timer.vim +DEPENDS=autoload/xolox.vim \ + autoload/xolox/escape.vim \ + autoload/xolox/timer.vim VIMDOC=doc/easytags.txt HTMLDOC=doc/readme.html ZIPDIR := $(shell mktemp -d) @@ -14,7 +15,7 @@ archive: Makefile easytags.vim autoload.vim $(VIMDOC) $(HTMLDOC) @mkdir -p $(ZIPDIR)/plugin $(ZIPDIR)/autoload/xolox $(ZIPDIR)/doc @cp easytags.vim $(ZIPDIR)/plugin @cp autoload.vim $(ZIPDIR)/autoload/easytags.vim - @cp $(DEPENDS) $(ZIPDIR)/autoload/xolox + @for SCRIPT in $(DEPENDS); do cp $$HOME/.vim/$$SCRIPT $(ZIPDIR)/$$SCRIPT; done @cp $(VIMDOC) $(ZIPDIR)/doc/easytags.txt @cp $(HTMLDOC) $(ZIPDIR)/doc/easytags.html @cd $(ZIPDIR) && zip -r $(ZIPFILE) . >/dev/null diff --git a/autoload.vim b/autoload.vim index 5900b85..600135a 100644 --- a/autoload.vim +++ b/autoload.vim @@ -95,7 +95,7 @@ function! easytags#highlight_cmd() " {{{1 endif let matches = filter(copy(taglist), tagkind.filter) call map(matches, 'xolox#escape#pattern(get(v:val, "name"))') - let pattern = tagkind.pattern_prefix . '\%(' . join(s:unique(matches), '\|') . '\)' . tagkind.pattern_suffix + let pattern = tagkind.pattern_prefix . '\%(' . join(xolox#unique(matches), '\|') . '\)' . tagkind.pattern_suffix let command = 'syntax match %s /%s/ containedin=ALLBUT,.*String.*,.*Comment.*' execute printf(command, hlgroup_tagged, escape(pattern, '/')) endfor @@ -104,21 +104,6 @@ function! easytags#highlight_cmd() " {{{1 endif endfunction -function! s:unique(list) - let index = 0 - while index < len(a:list) - let value = a:list[index] - let match = index(a:list, value, index+1) - if match >= 0 - call remove(a:list, match) - else - let index += 1 - endif - unlet value - endwhile - return a:list -endfunction - function! easytags#get_tagsfile() " {{{1 let tagsfile = expand(g:easytags_file) if filereadable(tagsfile) && filewritable(tagsfile) != 1 |