diff options
| author | David Bremner <bremner@debian.org> | 2012-06-17 07:38:59 -0300 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2012-06-17 07:38:59 -0300 |
| commit | 3dc2ff6fc73d3a057ae0a3f350c42b077d7ec273 (patch) | |
| tree | 19322fd5112777d877a7e31eef3efbc4ac0ef6cd /vim | |
| parent | 3b1e8a200dd4740b3c5605256e1535a681367347 (diff) | |
| parent | 2ef24acf03fdd73e39d2c233016e71f194affbcf (diff) | |
Merge branch 'release' into squeeze-backports
Conflicts:
debian/changelog
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/Makefile | 19 | ||||
| -rw-r--r-- | vim/plugin/notmuch.vim | 5 |
2 files changed, 12 insertions, 12 deletions
diff --git a/vim/Makefile b/vim/Makefile index 89e18be1..f17bebfe 100644 --- a/vim/Makefile +++ b/vim/Makefile @@ -1,11 +1,11 @@ .PHONY: all help install link symlink -FILES = plugin/notmuch.vim \ - $(wildcard syntax/notmuch-*.vim) +files = plugin/notmuch.vim \ + $(wildcard syntax/notmuch-*.vim) +prefix = $(HOME)/.vim +destdir = $(prefix)/plugin -PREFIX = $(shell ls -d ~/.vim/) - -OUT_FILES = $(FILES:%=${PREFIX}/%) +INSTALL = install -D -m644 all: help @@ -16,9 +16,8 @@ help: @echo " make install - copy plugin scripts and syntax files to ~/.vim" @echo " make symlink - create symlinks in ~/.vim (useful for development)" -install: ${OUT_FILES} -link symlink: - ${MAKE} SYMLINK=1 install +install: + @for x in $(files); do $(INSTALL) $(CURDIR)/$$x $(prefix)/$$x; done -${OUT_FILES}: ${PREFIX}/%: % - $(if ${SYMLINK},ln -fs,cp) `pwd`/$< $@ +link symlink: INSTALL = ln -fs +link symlink: install diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim index 21985c71..8f27fb92 100644 --- a/vim/plugin/notmuch.vim +++ b/vim/plugin/notmuch.vim @@ -48,7 +48,7 @@ let s:notmuch_defaults = { \ 'g:notmuch_show_part_end_regexp': ' part}' , \ 'g:notmuch_show_marker_regexp': ' \\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$', \ - \ 'g:notmuch_show_message_parse_regexp': '\(id:[^ ]*\) depth:\([0-9]*\) match:\([0-9]*\) filename:\(.*\)$', + \ 'g:notmuch_show_message_parse_regexp': '\(id:[^ ]*\) depth:\([0-9]*\) match:\([0-9]*\) excluded:\([0-9]*\) filename:\(.*\)$', \ 'g:notmuch_show_tags_regexp': '(\([^)]*\))$' , \ \ 'g:notmuch_show_signature_regexp': '^\(-- \?\|_\+\)$' , @@ -870,7 +870,8 @@ function! s:NM_cmd_show_parse(inlines) let msg['id'] = m[1] let msg['depth'] = m[2] let msg['match'] = m[3] - let msg['filename'] = m[4] + let msg['excluded'] = m[4] + let msg['filename'] = m[5] endif let in_message = 1 |