From: Felipe Contreras <felipe.contreras@gmail.com>
To: notmuch@notmuchmail.org
Cc: Bart Trojanowski <bart@jukie.net>
Subject: [PATCH 3/9] vim: cleanup search buffer
Date: Sat, 5 Jun 2010 14:12:36 +0300 [thread overview]
Message-ID: <1275736362-22771-4-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1275736362-22771-1-git-send-email-felipe.contreras@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
vim/plugin/notmuch.vim | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 3a19616..b8c9858 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -243,26 +243,23 @@ function! s:NM_cmd_search(words)
let b:nm_raw_lines = lines
let b:nm_search_words = a:words
- call <SID>NM_cmd_search_mksyntax()
call <SID>NM_set_map('n', g:notmuch_search_maps)
setlocal cursorline
setlocal nowrap
endfunction
function! s:NM_cmd_search_fmtline(line)
- let m = matchlist(a:line, '^\(thread:\S\+\)\s\([^]]\+\]\) \([^;]\+\); \(.*\) (\([^(]*\))$')
+ let m = matchlist(a:line, '^\(thread:\S\+\)\s\(.\{12\}\) \[\(\d\+\)/\d\+\] \([^;]\+\); \%(\[[^\[]\+\] \)*\(.*\) (\([^(]*\))$')
if !len(m)
return 'ERROR PARSING: ' . a:line
endif
let max = g:notmuch_search_from_column_width
- let from = m[3]
- if strlen(from) >= max
- let from = substitute(m[3][0:max-4], '[^A-Za-z1-9_]*$', '', '') . '...'
- endif
- return printf('%-20s %-20s | %s (%s)', m[2], from, m[4], m[5])
-endfunction
-function! s:NM_cmd_search_mksyntax()
- syntax clear nmSearchFrom
- exec printf('syntax match nmSearchFrom /\(\] \)\@<=.\{%d\}/ oneline contained', g:notmuch_search_from_column_width)
+ let flist = []
+ for at in split(m[4], ", ")
+ let p = min([stridx(at, "."), stridx(at, "@")])
+ call insert(flist, tolower(at[0:p - 1]))
+ endfor
+ let from = join(flist, ", ")
+ return printf("%-12s %3s %-20.20s | %s (%s)", m[2], m[3], from, m[5], m[6])
endfunction
" --- --- search screen action functions {{{2
--
1.7.1
next prev parent reply other threads:[~2010-06-05 11:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 11:12 [PATCH 0/9] vim improvements Felipe Contreras
2010-06-05 11:12 ` [PATCH 1/9] thread: really clean authors Felipe Contreras
2010-06-05 11:12 ` [PATCH 2/9] vim: add archive support from 'show' Felipe Contreras
2010-06-05 11:12 ` Felipe Contreras [this message]
2010-06-05 11:12 ` [PATCH 4/9] vim: cleanup search syntax Felipe Contreras
2010-06-05 11:12 ` [PATCH 5/9] vim: remove add_remove_tags_on_screen() Felipe Contreras
2010-06-05 11:12 ` [PATCH 6/9] vim: add option to mark as read + archive Felipe Contreras
2010-06-05 11:12 ` [PATCH 7/9] vim: use mailx for sending Felipe Contreras
2010-06-16 18:28 ` Felipe Contreras
2010-06-05 11:12 ` [PATCH 8/9] vim: run(): optimize non-debug path Felipe Contreras
2010-06-05 11:12 ` [PATCH 9/9] vim: include own improved git-diff syntax Felipe Contreras
2010-11-08 17:57 ` [PATCH 0/9] vim improvements Carl Worth
2010-11-08 18:04 ` Carl Worth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1275736362-22771-4-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=bart@jukie.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).