let s:notmuch_defaults = {
\ 'g:notmuch_cmd': 'notmuch' ,
- \ 'g:notmuch_search_reverse': 1 ,
+ \
+ \ 'g:notmuch_search_newest_first': 1 ,
+ \ 'g:notmuch_search_from_column_width': 20 ,
+ \
\ 'g:notmuch_show_fold_signatures': 1 ,
\ 'g:notmuch_show_fold_citations': 1 ,
+ \ 'g:notmuch_show_fold_bodies': 0 ,
+ \ 'g:notmuch_show_fold_headers': 1 ,
\
\ 'g:notmuch_show_message_begin_regexp': '^\fmessage{' ,
\ 'g:notmuch_show_message_end_regexp': '^\fmessage}' ,
" defaults for g:notmuch_initial_search_words
" override with: let g:notmuch_initial_search_words = [ ... ]
let s:notmuch_initial_search_words_defaults = [
- \ 'tag:inbox'
+ \ 'tag:inbox and tag:unread',
\ ]
" defaults for g:notmuch_show_headers
" override with: let g:notmuch_show_headers = [ ... ]
let s:notmuch_show_headers_defaults = [
\ 'Subject',
- \ 'From'
+ \ 'To',
+ \ 'Cc',
+ \ 'Bcc',
+ \ 'Date',
+ \ ]
+
+" defaults for g:notmuch_folders
+" override with: let g:notmuch_folders = [ ... ]
+let s:notmuch_folders_defaults = [
+ \ [ 'new', 'tag:inbox and tag:unread' ],
+ \ [ 'inbox', 'tag:inbox' ],
+ \ [ 'unread', 'tag:unread' ],
\ ]
" --- keyboard mapping definitions {{{1
+" --- --- bindings for folders mode {{{2
+
+let g:notmuch_folders_maps = {
+ \ 's': ':call <SID>NM_search_prompt()<CR>',
+ \ 'q': ':call <SID>NM_kill_this_buffer()<CR>',
+ \ '=': ':call <SID>NM_folders_refresh_view()<CR>',
+ \ '<Enter>': ':call <SID>NM_folders_show_search()<CR>',
+ \ }
+
" --- --- bindings for search screen {{{2
let g:notmuch_search_maps = {
\ '<Enter>': ':call <SID>NM_search_show_thread()<CR>',
+ \ '<C-]>': ':call <SID>NM_search_expand(''<cword>'')<CR>',
\ 'a': ':call <SID>NM_search_archive_thread()<CR>',
\ 'f': ':call <SID>NM_search_filter()<CR>',
\ 'm': ':call <SID>NM_new_mail()<CR>',
\ 's': ':call <SID>NM_search_prompt()<CR>',
\ 'S': ':call <SID>NM_search_edit()<CR>',
\ 't': ':call <SID>NM_search_filter_by_tag()<CR>',
- \ 'q': ':call <SID>NM_kill_buffer()<CR>',
+ \ 'q': ':call <SID>NM_kill_this_buffer()<CR>',
\ '+': ':call <SID>NM_search_add_tags([])<CR>',
\ '-': ':call <SID>NM_search_remove_tags([])<CR>',
\ '=': ':call <SID>NM_search_refresh_view()<CR>',
" --- --- bindings for show screen {{{2
let g:notmuch_show_maps = {
- \ '<C-N>': ':call <SID>NM_cmd_show_next()<CR>',
- \ 'c': ':call <SID>NM_cmd_show_fold_toggle(''c'', ''cit'', !g:notmuch_show_fold_citations)<CR>',
- \ 's': ':call <SID>NM_cmd_show_fold_toggle(''s'', ''sig'', !g:notmuch_show_fold_signatures)<CR>',
- \ 'q': ':call <SID>NM_kill_buffer()<CR>',
+ \ '<C-P>': ':call <SID>NM_show_previous(1)<CR>',
+ \ '<C-N>': ':call <SID>NM_show_next(1)<CR>',
+ \ '<C-]>': ':call <SID>NM_search_expand(''<cword>'')<CR>',
+ \ 'q': ':call <SID>NM_kill_this_buffer()<CR>',
+ \
+ \ 'b': ':call <SID>NM_show_fold_toggle(''b'', ''bdy'', !g:notmuch_show_fold_bodies)<CR>',
+ \ 'c': ':call <SID>NM_show_fold_toggle(''c'', ''cit'', !g:notmuch_show_fold_citations)<CR>',
+ \ 'h': ':call <SID>NM_show_fold_toggle(''h'', ''hdr'', !g:notmuch_show_fold_headers)<CR>',
+ \ 's': ':call <SID>NM_show_fold_toggle(''s'', ''sig'', !g:notmuch_show_fold_signatures)<CR>',
+ \
+ \ 'a': ':call <SID>NM_show_archive_thread()<CR>',
+ \ 'A': ':call <SID>NM_show_mark_read_then_archive_thread()<CR>',
+ \ 'N': ':call <SID>NM_show_mark_read_then_next_open_message()<CR>',
+ \ 'v': ':call <SID>NM_show_view_all_mime_parts()<CR>',
+ \ '+': ':call <SID>NM_show_add_tag()<CR>',
+ \ '-': ':call <SID>NM_show_remove_tag()<CR>',
+ \ '<Space>': ':call <SID>NM_show_advance_marking_read_and_archiving()<CR>',
+ \ '\|': ':call <SID>NM_show_pipe_message()<CR>',
+ \
+ \ 'r': ':call <SID>NM_show_reply()<CR>',
+ \ 'm': ':call <SID>NM_new_mail()<CR>',
\ }
+
+" --- implement folders screen {{{1
+
+function! s:NM_cmd_folders(words)
+ if len(a:words)
+ echoe 'Not exapecting any arguments for folders command.'
+ endif
+ let cmd = ['count']
+ let disp = []
+ let searches = []
+ for entry in g:notmuch_folders
+ let [ name, search ] = entry
+ let data = s:NM_run(cmd + [search])
+ let cnt = matchlist(data, '\(\d\+\)')[1]
+ call add(disp, printf('%9d %-20s (%s)', cnt, name, search))
+ call add(searches, search)
+ endfor
+
+ call <SID>NM_newBuffer('folders', join(disp, "\n"))
+ let b:nm_searches = searches
+ let b:nm_timestamp = reltime()
+
+ call <SID>NM_cmd_folders_mksyntax()
+ call <SID>NM_set_map(g:notmuch_folders_maps)
+ setlocal cursorline
+ setlocal nowrap
+endfunction
+
+function! s:NM_cmd_folders_mksyntax()
+endfunction
+
+" --- --- folders screen action functions {{{2
+
+function! s:NM_folders_refresh_view()
+ let lno = line('.')
+ setlocal bufhidden=delete
+ call s:NM_cmd_folders([])
+ exec printf('norm %dG', lno)
+endfunction
+
+function! s:NM_folders_show_search()
+ let line = line('.')
+ let search = b:nm_searches[line-1]
+
+ let prev_bufnr = bufnr('%')
+ setlocal bufhidden=hide
+ call <SID>NM_cmd_search([search])
+ setlocal bufhidden=delete
+ let b:nm_prev_bufnr = prev_bufnr
+endfunction
+
+
" --- implement search screen {{{1
function! s:NM_cmd_search(words)
let cmd = ['search']
- if g:notmuch_search_reverse
- let cmd = cmd + ['--reverse']
+ if g:notmuch_search_newest_first
+ let cmd = cmd + ['--sort=newest-first']
+ else
+ let cmd = cmd + ['--sort=oldest-first']
endif
let data = s:NM_run(cmd + a:words)
- "let data = substitute(data, '27/27', '25/27', '')
- "let data = substitute(data, '\[4/4\]', '[0/4]', '')
let lines = split(data, "\n")
let disp = copy(lines)
- call map(disp, 'substitute(v:val, "^thread:\\S* ", "", "")' )
+ call map(disp, 's:NM_cmd_search_fmtline(v:val)')
call <SID>NM_newBuffer('search', join(disp, "\n"))
let b:nm_raw_lines = lines
let b:nm_search_words = a:words
+ call <SID>NM_cmd_search_mksyntax()
call <SID>NM_set_map(g:notmuch_search_maps)
setlocal cursorline
setlocal nowrap
endfunction
+function! s:NM_cmd_search_fmtline(line)
+ let m = matchlist(a:line, '^\(thread:\S\+\)\s\([^]]\+\]\) \([^;]\+\); \(.*\) (\([^(]*\))$')
+ 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('%s %-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)
+endfunction
" --- --- search screen action functions {{{2
else
let tags = s:notmuch_initial_search_words_defaults
endif
- setlocal bufhidden=delete
+ if b:nm_type == 'search'
+ " TODO: we intend to replace the current buffer,
+ " ... maybe we could just clear it
+ let prev_bufnr = b:nm_prev_bufnr
+ setlocal bufhidden=delete
+ else
+ let prev_bufnr = bufnr('%')
+ setlocal bufhidden=hide
+ endif
call <SID>NM_cmd_search(tags)
+ setlocal bufhidden=delete
+ let b:nm_prev_bufnr = prev_bufnr
endfunction
function! s:NM_search_edit()
endfunction
function! s:NM_search_archive_thread()
+ call <SID>NM_add_remove_tags_on_screen('-', ['inbox'])
call <SID>NM_add_remove_tags('-', ['inbox'])
- " TODO: this could be made better and more generic
- setlocal modifiable
- s/(\([^)]*\)\<inbox\>\([^)]*\))$/(\1\2)/
- setlocal nomodifiable
norm j
endfunction
endif
let tags = split(text)
- map(tags, 'a:prefix . v:val')
+ map(tags, 'and a:prefix . v:val')
let tags = b:nm_search_words + tags
echo tags
let b:nm_prev_bufnr = prev_bufnr
endfunction
-function! s:NM_new_mail()
- echoe 'Not implemented'
-endfunction
-
function! s:NM_search_toggle_order()
- echoe 'Not implemented'
+ let g:notmuch_search_newest_first = !g:notmuch_search_newest_first
+ " FIXME: maybe this would be better done w/o reading re-reading the lines
+ " reversing the b:nm_raw_lines and the buffer lines would be better
+ call <SID>NM_search_refresh_view()
endfunction
function! s:NM_search_reply_to_thread()
- echoe 'Not implemented'
+ echo 'not implemented'
endfunction
function! s:NM_search_add_tags(tags)
function! s:NM_search_refresh_view()
let lno = line('.')
+ setlocal bufhidden=delete
call <SID>NM_cmd_search(b:nm_search_words)
" FIXME: should find the line of the thread we were on if possible
exec printf('norm %dG', lno)
if !strlen(text)
return
endif
- call <SID>NM_add_remove_tags(prefix, split(text, ' '))
+ let tags = split(text, ' ')
else
- call <SID>NM_add_remove_tags(prefix, a:intags)
+ let tags = a:intags
endif
- call <SID>NM_search_refresh_view()
-endfunction
-
-function! s:NM_add_remove_tags(prefix, tags)
- let id = <SID>NM_search_find_thread_id()
- if id == ''
- echoe 'Eeek! I couldn''t find the thead id!'
- endif
- call map(a:tags, 'a:prefix . v:val')
- " TODO: handle errors
- call <SID>NM_run(['tag'] + a:tags + ['--', id])
+ call <SID>NM_add_remove_tags(a:prefix, tags)
+ call <SID>NM_add_remove_tags_on_screen(a:prefix, tags)
endfunction
" --- implement show screen {{{1
endfunction
-function! s:NM_kill_buffer()
- if exists('b:nm_prev_bufnr')
- setlocal bufhidden=delete
- exec printf(":buffer %d", b:nm_prev_bufnr)
+function! s:NM_show_previous(can_change_thread)
+ let info = b:nm_raw_info
+ let lnum = line('.')
+ for msg in reverse(copy(info['msgs']))
+ if lnum <= msg['start']
+ continue
+ endif
+
+ exec printf('norm %dG', msg['start'])
+ " TODO: try to fit the message on screen
+ norm zz
+ return
+ endfor
+ if !a:can_change_thread
+ return
+ endif
+ call <SID>NM_kill_this_buffer()
+ if line('.') != line('0')
+ norm k
+ call <SID>NM_search_show_thread()
+ norm G
+ call <SID>NM_show_previous(0)
else
- echo "Nothing to kill."
+ echo 'No more messages.'
endif
endfunction
-function! s:NM_cmd_show_next()
+function! s:NM_show_next(can_change_thread)
let info = b:nm_raw_info
let lnum = line('.')
- let cnt = 0
for msg in info['msgs']
- let cnt = cnt + 1
if lnum >= msg['start']
continue
endif
exec printf('norm %dG', msg['start'])
+ " TODO: try to fit the message on screen
norm zz
return
endfor
- norm qj
- call <SID>NM_search_show_thread()
+ if !a:can_change_thread
+ return
+ endif
+ call <SID>NM_kill_this_buffer()
+ if line('.') != line('$')
+ norm j
+ call <SID>NM_search_show_thread()
+ else
+ echo 'No more messages.'
+ endif
endfunction
-function! s:NM_cmd_show_fold_toggle(key, type, fold)
+function! s:NM_show_archive_thread()
+ echo 'not implemented'
+endfunction
+
+function! s:NM_show_mark_read_then_archive_thread()
+ echo 'not implemented'
+endfunction
+
+function! s:NM_show_next_message()
+ echo 'not implemented'
+endfunction
+
+function! s:NM_show_mark_read_then_next_open_message()
+ echo 'not implemented'
+endfunction
+
+function! s:NM_show_previous_message()
+ echo 'not implemented'
+endfunction
+
+function! s:NM_show_reply()
+ echo 'not implemented'
+endfunction
+
+function! s:NM_show_view_all_mime_parts()
+ echo 'not implemented'
+endfunction
+
+function! s:NM_show_view_raw_message()
+ echo 'not implemented'
+endfunction
+
+function! s:NM_show_add_tag()
+ echo 'not implemented'
+endfunction
+
+function! s:NM_show_remove_tag()
+ echo 'not implemented'
+endfunction
+
+function! s:NM_show_advance_marking_read_and_archiving()
+ echo 'not implemented'
+endfunction
+
+function! s:NM_show_pipe_message()
+ echo 'not implemented'
+endfunction
+
+" --- --- search screen helper functions {{{2
+
+function! s:NM_show_fold_toggle(key, type, fold)
let info = b:nm_raw_info
let act = 'open'
if a:fold
exec printf('%dfold%s', fld[1], act)
endif
endfor
- exec printf('nnoremap <buffer> %s :call <SID>NM_cmd_show_fold_toggle(''%s'', ''%s'', %d)<CR>', a:key, a:key, a:type, !a:fold)
+ exec printf('nnoremap <buffer> %s :call <SID>NM_show_fold_toggle(''%s'', ''%s'', %d)<CR>', a:key, a:key, a:type, !a:fold)
endfunction
elseif mode_type == 'cit'
if part_end || match(line, g:notmuch_show_citation_regexp) == -1
let outlnum = len(info['disp'])
- let foldinfo = [ mode_type, mode_start, outlnum,
- \ printf('[ %d-line citation. Press "c" to show. ]', outlnum - mode_start) ]
+ if mode_start != outlnum
+ let foldinfo = [ mode_type, mode_start, outlnum-1,
+ \ printf('[ %d-line citation. Press "c" to show. ]', outlnum - mode_start) ]
+ endif
let mode_type = ''
endif
elseif mode_type == 'sig'
let outlnum = len(info['disp'])
if (outlnum - mode_start) > g:notmuch_show_signature_lines_max
- echoe 'line ' . outlnum . ' stopped matching'
let mode_type = ''
elseif part_end
- let foldinfo = [ mode_type, mode_start, outlnum,
- \ printf('[ %d-line signature. Press "s" to show. ]', outlnum - mode_start) ]
+ if mode_start != outlnum
+ let foldinfo = [ mode_type, mode_start, outlnum-1,
+ \ printf('[ %d-line signature. Press "s" to show. ]', outlnum - mode_start) ]
+ endif
let mode_type = ''
endif
endif
endif
if match(line, g:notmuch_show_body_end_regexp) != -1
let body_end = len(info['disp'])
- let foldinfo = [ 'body', body_start, body_end,
+ let foldinfo = [ 'bdy', body_start, body_end,
\ printf('[ BODY %d - %d lines ]', len(info['msgs']), body_end - body_start) ]
let in_body = 0
else
if match(line, g:notmuch_show_header_end_regexp) != -1
+ let hdr_start = msg['hdr_start']+1
+ let hdr_end = len(info['disp'])
+ let foldinfo = [ 'hdr', hdr_start, hdr_end,
+ \ printf('[ %d-line headers. Press "h" to show. ]', hdr_end + 1 - hdr_start) ]
let msg['header'] = hdr
let in_header = 0
let hdr = {}
let msg['end'] = len(info['disp'])
call add(info['disp'], '')
- let foldinfo = [ 'match', msg['start'], msg['end'],
+ let foldinfo = [ 'msg', msg['start'], msg['end'],
\ printf('[ MSG %d - %s ]', len(info['msgs']), msg['descr']) ]
call add(info['msgs'], msg)
exec printf('%d,%dfold', afold[1], afold[2])
if (afold[0] == 'sig' && g:notmuch_show_fold_signatures)
\ || (afold[0] == 'cit' && g:notmuch_show_fold_citations)
+ \ || (afold[0] == 'bdy' && g:notmuch_show_fold_bodies)
+ \ || (afold[0] == 'hdr' && g:notmuch_show_fold_headers)
exec printf('%dfoldclose', afold[1])
else
exec printf('%dfoldopen', afold[1])
" --- notmuch helper functions {{{1
-function! s:NM_newBuffer(ft, content)
+function! s:NM_newBuffer(type, content)
enew
setlocal buftype=nofile readonly modifiable
silent put=a:content
keepjumps 0d
setlocal nomodifiable
- execute printf('set filetype=notmuch-%s', a:ft)
- execute printf('set syntax=notmuch-%s', a:ft)
+ execute printf('set filetype=notmuch-%s', a:type)
+ execute printf('set syntax=notmuch-%s', a:type)
+ let b:nm_type = a:type
endfunction
function! s:NM_run(args)
let cmd = g:notmuch_cmd . ' ' . join(a:args) . '< /dev/null'
+
+ let start = reltime()
let out = system(cmd)
- if v:shell_error
+ let err = v:shell_error
+ let delta = reltime(start)
+
+ echo printf('[%s] {%s} %s', reltimestr(delta), string(err), string(cmd))
+
+ if err
echohl Error
echo substitute(out, '\n*$', '', '')
echohl None
endif
endfunction
+" --- external mail handling helpers {{{1
+
+function! s:NM_new_mail()
+ echo 'not implemented'
+endfunction
+
+" --- other helpers {{{1
+
+function! s:NM_kill_this_buffer()
+ if exists('b:nm_prev_bufnr')
+ setlocal bufhidden=delete
+ exec printf(":buffer %d", b:nm_prev_bufnr)
+ else
+ echo "Nothing to kill."
+ endif
+endfunction
+
+function! s:NM_search_expand(arg)
+ let word = expand(a:arg)
+ let prev_bufnr = bufnr('%')
+ setlocal bufhidden=hide
+ call <SID>NM_cmd_search([word])
+ setlocal bufhidden=delete
+ let b:nm_prev_bufnr = prev_bufnr
+endfunction
+
+function! s:NM_add_remove_tags(prefix, tags)
+ let id = <SID>NM_search_find_thread_id()
+ if id == ''
+ echoe 'Eeek! I couldn''t find the thead id!'
+ endif
+ call map(a:tags, 'a:prefix . v:val')
+ " TODO: handle errors
+ call <SID>NM_run(['tag'] + a:tags + ['--', id])
+endfunction
+
+function! s:NM_add_remove_tags_on_screen(prefix, tags)
+ let online = ''
+ setlocal modifiable
+ if a:prefix == '-'
+ for tagname in a:tags
+ exec printf('silent %ss/(\([^)]*\)\<%s\>\([^)]*\))$/(\1\2)/', online, tagname)
+ endfor
+ else
+ for tagname in a:tags
+ exec printf('silent %ss/(\([^)]*\)\([^)]*\))$/(\1 %s)/', online, tagname)
+ endfor
+ endif
+ setlocal nomodifiable
+endfunction
+
" --- process and set the defaults {{{1
function! NM_set_defaults(force)
let cmd = printf('let %s = %d', key, dflt)
elseif type(dflt) == type('')
let cmd = printf('let %s = ''%s''', key, dflt)
+ " FIXME: not sure why this didn't work when dflt is an array
"elseif type(dflt) == type([])
" let cmd = printf('let %s = %s', key, string(dflt))
else
if !exists('g:notmuch_initial_search_words')
let g:notmuch_initial_search_words = s:notmuch_initial_search_words_defaults
endif
+if !exists('g:notmuch_folders')
+ let g:notmuch_folders = s:notmuch_folders_defaults
+endif
" --- assign keymaps {{{1
function! s:NM_set_map(maps)
+ nmapclear
for [key, code] in items(a:maps)
exec printf('nnoremap <buffer> %s %s', key, code)
endfor
+ " --- this is a hack for development :)
+ nnoremap ,nmr :source ~/.vim/plugin/notmuch.vim<CR>:call NotMuch('')<CR>
endfunction
" --- command handler {{{1
function! NotMuch(args)
- if !strlen(a:args)
- if exists('b:nm_search_words')
+ let args = a:args
+ if !strlen(args)
+ let args = 'folders'
+ endif
+
+ let words = split(args)
+ if words[0] == 'folders'
+ let words = words[1:]
+ call <SID>NM_cmd_folders(words)
+ elseif words[0] == 'search'
+ if len(words) > 1
+ let words = words[1:]
+ elseif exists('b:nm_search_words')
let words = b:nm_search_words
else
let words = g:notmuch_initial_search_words
endif
call <SID>NM_cmd_search(words)
- return
- endif
-
- echo "blarg!"
- let words = split(a:args)
- " TODO: handle commands passed as arguments
+ elseif words[0] == 'show'
+ echoe 'show is not yet implemented.'
+ endif
endfunction
function! CompleteNotMuch(arg_lead, cmd_line, cursor_pos)
return []
command! -nargs=* -complete=customlist,CompleteNotMuch NotMuch call NotMuch(<q-args>)
cabbrev notmuch <c-r>=(getcmdtype()==':' && getcmdpos()==1 ? 'NotMuch' : 'notmuch')<CR>
-" --- hacks, only for development :) {{{1
-
-nnoremap ,nmr :source ~/.vim/plugin/notmuch.vim<CR>:call NotMuch('')<CR>
-
" vim: set ft=vim ts=8 sw=8 et foldmethod=marker :
projects / notmuch / blobdiff