diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-08-06 18:10:31 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-08-06 18:10:31 +0200 |
| commit | 7192d0221a361d3d9cfd6626058e4a1c86ea7b44 (patch) | |
| tree | 11d3db0604f47498e16b50ef7f559e138bfe4482 /vim | |
| parent | 6bc2f5a999d9ff77779d98b7cc688a4350ea65d9 (diff) | |
| parent | 6b820673fc9c2483572af5ec7ea91e4d7d7258c9 (diff) | |
Merge remote-tracking branch 'origin/master' into vim
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 89e18be..f17bebf 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 21985c7..8f27fb9 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 |