" along with Notmuch. If not, see <http://www.gnu.org/licenses/>.
"
" Authors: Bart Trojanowski <bart@jukie.net>
-
+" Contributors: Felipe Contreras <felipe.contreras@gmail.com>,
+" Peter Hartman <peterjohnhartman@gmail.com>
+"
" --- configuration defaults {{{1
let s:notmuch_defaults = {
\ 'g:notmuch_cmd': 'notmuch' ,
+ \ 'g:notmuch_sendmail': '/usr/sbin/sendmail' ,
\ 'g:notmuch_debug': 0 ,
\
\ 'g:notmuch_search_newest_first': 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}' ,
- \ 'g:notmuch_show_header_begin_regexp': '^\fheader{' ,
- \ 'g:notmuch_show_header_end_regexp': '^\fheader}' ,
- \ 'g:notmuch_show_body_begin_regexp': '^\fbody{' ,
- \ 'g:notmuch_show_body_end_regexp': '^\fbody}' ,
- \ 'g:notmuch_show_attachment_begin_regexp': '^\fattachment{' ,
- \ 'g:notmuch_show_attachment_end_regexp': '^\fattachment}' ,
- \ 'g:notmuch_show_part_begin_regexp': '^\fpart{' ,
- \ 'g:notmuch_show_part_end_regexp': '^\fpart}' ,
- \ 'g:notmuch_show_marker_regexp': '^\f\\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$',
+ \ 'g:notmuch_show_message_begin_regexp': '\fmessage{' ,
+ \ 'g:notmuch_show_message_end_regexp': '\fmessage}' ,
+ \ 'g:notmuch_show_header_begin_regexp': '\fheader{' ,
+ \ 'g:notmuch_show_header_end_regexp': '\fheader}' ,
+ \ 'g:notmuch_show_body_begin_regexp': '\fbody{' ,
+ \ 'g:notmuch_show_body_end_regexp': '\fbody}' ,
+ \ 'g:notmuch_show_attachment_begin_regexp': '\fattachment{' ,
+ \ 'g:notmuch_show_attachment_end_regexp': '\fattachment}' ,
+ \ 'g:notmuch_show_part_begin_regexp': '\fpart{' ,
+ \ 'g:notmuch_show_part_end_regexp': '\fpart}' ,
+ \ 'g:notmuch_show_marker_regexp': '\f\\(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': '^\(-- \?\|_\+\)$' ,
\
\ 'g:notmuch_show_citation_regexp': '^\s*>' ,
\
- \ 'g:notmuch_compose_temp_file_dir': '~/.notmuch/compose/' ,
+ \ 'g:notmuch_compose_insert_mode_start': 1 ,
+ \ 'g:notmuch_compose_header_help': 1 ,
+ \ 'g:notmuch_compose_temp_file_dir': '~/.notmuch/compose' ,
\ }
" defaults for g:notmuch_initial_search_words
" --- --- bindings for folders mode {{{2
let g:notmuch_folders_maps = {
+ \ 'm': ':call <SID>NM_new_mail()<CR>',
\ 's': ':call <SID>NM_search_prompt()<CR>',
\ 'q': ':call <SID>NM_kill_this_buffer()<CR>',
\ '=': ':call <SID>NM_folders_refresh_view()<CR>',
" --- --- bindings for search screen {{{2
let g:notmuch_search_maps = {
- \ '<Enter>': ':call <SID>NM_search_show_thread()<CR>',
+ \ '<Space>': ':call <SID>NM_search_show_thread(0)<CR>',
+ \ '<Enter>': ':call <SID>NM_search_show_thread(1)<CR>',
\ '<C-]>': ':call <SID>NM_search_expand(''<cword>'')<CR>',
+ \ 'I': ':call <SID>NM_search_mark_read_thread()<CR>',
\ 'a': ':call <SID>NM_search_archive_thread()<CR>',
+ \ 'A': ':call <SID>NM_search_mark_read_then_archive_thread()<CR>',
+ \ 'D': ':call <SID>NM_search_delete_thread()<CR>',
\ 'f': ':call <SID>NM_search_filter()<CR>',
\ 'm': ':call <SID>NM_new_mail()<CR>',
\ 'o': ':call <SID>NM_search_toggle_order()<CR>',
\ '+': ':call <SID>NM_search_add_tags([])<CR>',
\ '-': ':call <SID>NM_search_remove_tags([])<CR>',
\ '=': ':call <SID>NM_search_refresh_view()<CR>',
- \ '?': ':echo <SID>NM_search_thread_id()<CR>',
+ \ '?': ':echo <SID>NM_search_thread_id() . '' @ '' . join(<SID>NM_get_search_words())<CR>',
\ }
" --- --- bindings for show screen {{{2
\ '<C-N>': ':call <SID>NM_show_next(1, 0)<CR>',
\ '<C-]>': ':call <SID>NM_search_expand(''<cword>'')<CR>',
\ 'q': ':call <SID>NM_kill_this_buffer()<CR>',
+ \ 's': ':call <SID>NM_search_prompt()<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>',
+ \ 'i': ':call <SID>NM_show_fold_toggle(''i'', ''sig'', !g:notmuch_show_fold_signatures)<CR>',
\
+ \ 'I': ':call <SID>NM_show_mark_read_thread()<CR>',
\ 'a': ':call <SID>NM_show_archive_thread()<CR>',
\ 'A': ':call <SID>NM_show_mark_read_then_archive_thread()<CR>',
+ \ 'D': ':call <SID>NM_show_delete_thread()<CR>',
+ \ 'd': ':call <SID>NM_show_delete_message()<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>',
\
\ 'r': ':call <SID>NM_show_reply()<CR>',
\ 'm': ':call <SID>NM_new_mail()<CR>',
- \ '?': ':echo <SID>NM_show_message_id() . '' @ '' . join(<SID>NM_show_search_words())<CR>',
+ \ '?': ':echo <SID>NM_show_message_id() . '' @ '' . join(<SID>NM_get_search_words())<CR>',
\ }
" --- --- bindings for compose screen {{{2
let g:notmuch_compose_nmaps = {
\ ',s': ':call <SID>NM_compose_send()<CR>',
+ \ ',a': ':call <SID>NM_compose_attach()<CR>',
\ ',q': ':call <SID>NM_kill_this_buffer()<CR>',
\ '<Tab>': ':call <SID>NM_compose_next_entry_area()<CR>',
\ }
function! s:NM_cmd_folders(words)
if len(a:words)
- echoe 'Not exapecting any arguments for folders command.'
+ throw 'Not expecting any arguments for folders command.'
endif
let cmd = ['count']
let disp = []
call add(searches, search)
endfor
- call <SID>NM_newBuffer('folders', join(disp, "\n"))
+ call <SID>NM_newBuffer('', 'folders', join(disp, "\n"))
let b:nm_searches = searches
let b:nm_timestamp = reltime()
let disp = copy(lines)
call map(disp, 's:NM_cmd_search_fmtline(v:val)')
- call <SID>NM_newBuffer('search', join(disp, "\n"))
+ 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('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 = split(at, '[@.]')
+ let flist[p[0]] = 1
+ endfor
+ let from = join(keys(flist), ", ")
+ return printf("%-12s %3s %-20.20s | %s (%s)", m[2], m[3], from, m[5], m[6])
endfunction
" --- --- search screen action functions {{{2
-function! s:NM_search_show_thread()
- let id = <SID>NM_search_thread_id()
- if id != ''
- let words = [id]
- if exists('b:nm_search_words')
- let words = ['('] + b:nm_search_words + [')', 'and', id]
- endif
- if len(words)
- call <SID>NM_cmd_show(words)
- endif
+function! s:NM_search_show_thread(everything)
+ let words = [ <SID>NM_search_thread_id() ]
+ if !a:everything && exists('b:nm_search_words')
+ call extend(words, ['AND', '('])
+ call extend(words, b:nm_search_words)
+ call add(words, ')')
endif
+ call <SID>NM_cmd_show(words)
+ let b:nm_show_everything = a:everything
endfunction
function! s:NM_search_prompt()
endif
endfunction
+function! s:NM_search_mark_read_thread()
+ call <SID>NM_tag([], ['-unread'])
+ norm j
+endfunction
+
function! s:NM_search_archive_thread()
- call <SID>NM_add_remove_tags_on_screen('', '-', ['inbox'])
- call <SID>NM_add_remove_tags([], '-', ['inbox'])
+ call <SID>NM_tag([], ['-inbox'])
+ norm j
+endfunction
+
+function! s:NM_search_mark_read_then_archive_thread()
+ call <SID>NM_tag([], ['-unread', '-inbox'])
+ norm j
+endfunction
+
+function! s:NM_search_delete_thread()
+ call <SID>NM_tag([], ['+delete','-inbox','-unread'])
norm j
endfunction
function! s:NM_search_filter_helper(prompt, prefix, joiner)
" TODO: input() can support completion
- let text = input(a:prompt)
+ let text = substitute(input(a:prompt), '\v(^\s*|\s*$|\n)', '', 'g')
if !strlen(text)
return
endif
- let tags = split(text)
- if strlen(a:prefix)
- call map(tags, 'a:prefix . v:val')
- endif
- if strlen(a:joiner)
- let idx = len(tags) - 1
- while idx > 0
- call insert(tags, a:joiner, idx)
- let idx = idx - 1
- endwhile
- endif
- let tags = b:nm_search_words + ['and', '('] + tags + [')']
+ let tags = b:nm_search_words + ['AND']
+ \ + <SID>NM_combine_tags(a:prefix, split(text), a:joiner, '()')
let prev_bufnr = bufnr('%')
setlocal bufhidden=hide
endfunction
function! s:NM_search_reply_to_thread()
- echo 'not implemented'
+ let cmd = ['reply']
+ call add(cmd, <SID>NM_search_thread_id())
+ call add(cmd, 'AND')
+ call extend(cmd, <SID>NM_get_search_words())
+
+ let data = <SID>NM_run(cmd)
+ let lines = split(data, "\n")
+ call <SID>NM_newComposeBuffer(lines, 0)
endfunction
function! s:NM_search_add_tags(tags)
function! s:NM_search_thread_id()
if !exists('b:nm_raw_lines')
- echoe 'no b:nm_raw_lines'
- return ''
+ throw 'Eeek! no b:nm_raw_lines'
endif
let mnum = line('.') - 1
if len(b:nm_raw_lines) <= mnum
return ''
endif
- echo 'len=' . string(len(b:nm_raw_lines)) . ' mnum=' . string(mnum)
let info = b:nm_raw_lines[mnum]
let what = split(info, '\s\+')[0]
return what
else
let tags = a:intags
endif
- call <SID>NM_add_remove_tags([], a:prefix, tags)
- call <SID>NM_add_remove_tags_on_screen('', a:prefix, tags)
+ call map(tags, 'a:prefix . v:val')
+ call <SID>NM_tag([], tags)
endfunction
" --- implement show screen {{{1
function! s:NM_cmd_show(words)
let prev_bufnr = bufnr('%')
- let data = s:NM_run(['show'] + a:words)
+ let data = s:NM_run(['show', '--entire-thread'] + a:words)
let lines = split(data, "\n")
let info = s:NM_cmd_show_parse(lines)
setlocal bufhidden=hide
- call <SID>NM_newBuffer('show', join(info['disp'], "\n"))
+ call <SID>NM_newBuffer('', 'show', join(info['disp'], "\n"))
setlocal bufhidden=delete
- let b:nm_words = a:words
+ let b:nm_search_words = a:words
let b:nm_raw_info = info
let b:nm_prev_bufnr = prev_bufnr
endfunction
function! s:NM_show_previous(can_change_thread, find_matching)
+ let everything = exists('b:nm_show_everything') ? b:nm_show_everything : 0
let info = b:nm_raw_info
let lnum = line('.')
for msg in reverse(copy(info['msgs']))
call <SID>NM_kill_this_buffer()
if line('.') > 1
norm k
- call <SID>NM_search_show_thread()
+ call <SID>NM_search_show_thread(everything)
norm G
call <SID>NM_show_previous(0, a:find_matching)
else
endfunction
function! s:NM_show_next_thread()
+ let everything = exists('b:nm_show_everything') ? b:nm_show_everything : 0
call <SID>NM_kill_this_buffer()
if line('.') != line('$')
norm j
- call <SID>NM_search_show_thread()
+ call <SID>NM_search_show_thread(everything)
else
echo 'No more messages.'
endif
endfunction
+function! s:NM_show_mark_read_thread()
+ call <SID>NM_tag(b:nm_search_words, ['-unread'])
+ call <SID>NM_show_next_thread()
+endfunction
+
function! s:NM_show_archive_thread()
- echo 'not implemented'
+ call <SID>NM_tag(b:nm_search_words, ['-inbox'])
+ call <SID>NM_show_next_thread()
endfunction
function! s:NM_show_mark_read_then_archive_thread()
- echo 'not implemented'
+ call <SID>NM_tag(b:nm_search_words, ['-unread', '-inbox'])
+ call <SID>NM_show_next_thread()
+endfunction
+
+function! s:NM_show_delete_thread()
+ call <SID>NM_tag(b:nm_search_words, ['+delete', '-inbox', '-unread'])
+ call <SID>NM_show_next_thread()
+endfunction
+
+function! s:NM_show_delete_message()
+ let msg = <SID>NM_show_get_message_for_line(line('.'))
+ call <SID>NM_tag([msg['id']], ['+delete', '-inbox', '-unread'])
endfunction
function! s:NM_show_mark_read_then_next_open_message()
endfunction
function! s:NM_show_reply()
- echo 'not implemented'
+ let cmd = ['reply']
+ call add(cmd, <SID>NM_show_message_id())
+ call add(cmd, 'AND')
+ call extend(cmd, <SID>NM_get_search_words())
+
+ let data = <SID>NM_run(cmd)
+ let lines = split(data, "\n")
+ call <SID>NM_newComposeBuffer(lines, 0)
endfunction
function! s:NM_show_view_all_mime_parts()
let msg_top = <SID>NM_show_get_message_for_line(vis_top)
if !has_key(msg_top,'id')
- echo "No top visible message."
+ throw "No top visible message."
endif
" if the top message is the last message, just expunge the entire thread and move on
let ids = []
for msg in b:nm_raw_info['msgs']
if has_key(msg,'match') && msg['match'] != '0'
- if len(ids)
- call add(ids, 'OR')
- endif
call add(ids, msg['id'])
endif
endfor
-
- let filter = ['('] + advance_tags + [')', 'AND', '('] + ids + [')']
- call <SID>NM_add_remove_tags(filter, '-', advance_tags)
+ let filter = <SID>NM_combine_tags('tag:', advance_tags, 'OR', '()')
+ \ + ['AND']
+ \ + <SID>NM_combine_tags('', ids, 'OR', '()')
+ call map(advance_tags, '"-" . v:val')
+ call <SID>NM_tag(filter, advance_tags)
call <SID>NM_show_next(1, 1)
return
endif
let msg_bot = <SID>NM_show_get_message_for_line(vis_bot)
if !has_key(msg_bot,'id')
- echo "No bottom visible message."
+ throw "No bottom visible message."
endif
" if entire message fits on the screen, read/archive it, move to the next one
if msg_top['id'] != msg_bot['id'] || msg_top['end'] <= vis_bot
- call <SID>NM_add_remove_tags_on_screen(msg_top['start'], '-', advance_tags)
exec printf('norm %dG', vis_top)
call <SID>NM_show_next(0, 1)
if has_key(msg_top,'match') && msg_top['match'] != '0'
redraw
" do this last to hide the latency
- let filter = ['('] + advance_tags + [')', 'AND', msg_top['id']]
- call <SID>NM_add_remove_tags(filter, '-', advance_tags)
+ let filter = <SID>NM_combine_tags('tag:', advance_tags, 'OR', '()')
+ \ + ['AND', msg_top['id']]
+ call map(advance_tags, '"-" . v:val')
+ call <SID>NM_tag(filter, advance_tags)
endif
return
endif
function! s:NM_show_message_id()
if !exists('b:nm_raw_info')
- echoe 'no b:nm_raw_info'
- return ''
+ throw 'Eeek! no b:nm_raw_info'
endif
let msg = <SID>NM_show_get_message_for_line(line('.'))
if has_key(msg,'id')
return ''
endfunction
-function! s:NM_show_search_words()
- if !exists('b:nm_words')
- echoe 'no b:nm_words'
- return []
- endif
- return b:nm_words
-endfunction
-
function! s:NM_show_fold_toggle(key, type, fold)
let info = b:nm_raw_info
let act = 'open'
let act = 'close'
endif
for fld in info['folds']
- if fld[0] == a:type
- exec printf('%dfold%s', fld[1], act)
+ if fld[0] != a:type
+ continue
+ endif
+ "let idx = fld[3]
+ "let msg = info['msgs'][idx]
+ "if has_key(msg,'match') && msg['match'] == '0'
+ " continue
+ "endif
+ let cls = foldclosed(fld[1])
+ if cls != -1 && cls != fld[1]
+ continue
endif
+ exec printf('%dfold%s', fld[1], act)
endfor
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-1, len(info['msgs']),
- \ printf('[ %d-line citation. Press "c" to show. ]', outlnum - mode_start) ]
+ if !part_end
+ let outlnum = outlnum - 1
+ endif
+ let foldinfo = [ mode_type, mode_start, outlnum, len(info['msgs']),
+ \ printf('[ %d-line citation. Press "c" to show. ]', 1 + outlnum - mode_start) ]
let mode_type = ''
endif
elseif mode_type == 'sig'
if (outlnum - mode_start) > g:notmuch_show_signature_lines_max
let mode_type = ''
elseif part_end
- let foldinfo = [ mode_type, mode_start, outlnum-1, len(info['msgs']),
- \ printf('[ %d-line signature. Press "s" to show. ]', outlnum - mode_start) ]
+ let foldinfo = [ mode_type, mode_start, outlnum, len(info['msgs']),
+ \ printf('[ %d-line signature. Press "i" to show. ]', 1 + outlnum - mode_start) ]
let mode_type = ''
endif
endif
if part_end
" FIXME: this is a hack for handling two folds being added for one line
- " we should handle addinga fold in a function
+ " we should handle adding a fold in a function
if len(foldinfo) && foldinfo[1] < foldinfo[2]
call add(info['folds'], foldinfo[0:3])
let info['foldtext'][foldinfo[1]] = foldinfo[4]
endif
call add(info['disp'],
\ printf('--- %s ---', in_part))
- let part_start = len(info['disp']) + 1
+ " We don't yet handle nested parts, so pop
+ " multipart/* immediately so text/plain
+ " sub-parts are parsed properly
+ if match(in_part, '^multipart/') != -1
+ let in_part = ''
+ else
+ let part_start = len(info['disp']) + 1
+ endif
endif
elseif in_header
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
let hdrs = { }
for word in a:words
- let m = matchlist(word, '^\([^:]\+\):\s*\(.*\)\s*$')
+ let m = matchlist(word, '^\(\w[^:]*\):\s*\(.*\)\s*$')
if !len(m)
throw 'Eeek! bad parameter ''' . string(word) . ''''
endif
endif
endfor
- call extend(lines, [ '', '' ])
+ call add(lines, '')
if !start_on_line
let start_on_line = len(lines) + 1
endif
if len(a:body_lines)
call extend(lines, a:body_lines)
else
- call add(lines, '')
+ call extend(lines, [ '', '' ])
endif
- call extend(lines, g:notmuch_signature)
- let prev_bufnr = bufnr('%')
- setlocal bufhidden=hide
- call <SID>NM_newFileBuffer(g:notmuch_compose_temp_file_dir, '%s.mail',
- \ 'compose', lines)
- setlocal bufhidden=hide
+ call <SID>NM_newComposeBuffer(lines, start_on_line)
+endfunction
- call <SID>NM_cmd_compose_mksyntax()
- call <SID>NM_set_map('n', g:notmuch_compose_nmaps)
- call <SID>NM_set_map('i', g:notmuch_compose_imaps)
+function! s:NM_compose_send()
+ call <SID>NM_assert_buffer_type('compose')
+ let fname = expand('%')
+ let lnum = 1
+ let line = getline(lnum)
+ let lst_hdr = ''
+ while match(line, '^$') == -1
+ if !exists("hdr_starts") && match(line, '^Notmuch-Help:') == -1
+ let hdr_starts = lnum - 1
+ endif
+ let lnum = lnum + 1
+ let line = getline(lnum)
+ endwhile
+ let body_starts = lnum - 1
- exec printf('norm %dG', start_on_line)
- startinsert!
- echo 'Type your message, use <TAB> to jump to next header and then body.'
-endfunction
-function! s:NM_cmd_compose_mksyntax()
- silent! setlocal syntax=mail
+ call append(body_starts, 'Date: ' . strftime('%a, %d %b %Y %H:%M:%S %z'))
+ exec printf(':0,%dd', hdr_starts)
+ write
+
+ let line = getline(1)
+ let m = matchlist(line, '^From:\s*\(.*\)\s*<\(.*\)>$')
+ if (len(m) >= 2)
+ let from = m[2]
+ else
+ let m = matchlist(line, '^From:\s*\(.*\)$')
+ let from = m[1]
+ endif
+
+ let cmdtxt = g:notmuch_sendmail . ' -t -f ' . from . ' < ' . fname
+ let out = system(cmdtxt)
+ let err = v:shell_error
+ if err
+ undo
+ write
+ call <SID>NM_newBuffer('new', 'error',
+ \ "While running...\n" .
+ \ ' ' . cmdtxt . "\n" .
+ \ "\n" .
+ \ "Failed with...\n" .
+ \ substitute(out, '^', ' ', 'g'))
+ echohl Error
+ echo 'Eeek! unable to send mail'
+ echohl None
+ return
+ endif
+
+ if !exists('b:nm_prev_bufnr')
+ bdelete
+ else
+ let prev_bufnr = b:nm_prev_bufnr
+ bdelete
+ if prev_bufnr == bufnr('%')
+ exec printf("buffer %d", prev_bufnr)
+ endif
+ endif
+ call delete(fname)
+ echo 'Mail sent successfully.'
endfunction
-function! s:NM_compose_send()
+function! s:NM_compose_attach()
echo 'not implemented'
endfunction
function! s:NM_compose_next_entry_area()
let lnum = line('.')
let hdr_end = <SID>NM_compose_find_line_match(1,'^$',1)
- echo 'header end = ' . string(hdr_end)
if lnum < hdr_end
let lnum = lnum + 1
let line = getline(lnum)
call cursor(lnum+1, strlen(getline(lnum+1)) + 1)
return ''
endif
- echo 'mode=' . mode()
if mode() == 'i'
if !getbufvar(bufnr('.'), '&et')
return "\t"
" --- --- compose screen helper functions {{{2
function! s:NM_compose_get_user_email()
- let name = substitute(system('id -u -n'), '\v(^\s*|\s*$|\n)', '', 'g')
- let fqdn = substitute(system('hostname -f'), '\v(^\s*|\s*$|\n)', '', 'g')
-
- " TODO: do this properly
- return name . '@' . fqdn
+ " TODO: do this properly (still), i.e., allow for multiple email accounts
+ let email = substitute(system('notmuch config get user.primary_email'), '\v(^\s*|\s*$|\n)', '', 'g')
+ return email
endfunction
function! s:NM_compose_find_line_match(start, pattern, failure)
" --- notmuch helper functions {{{1
-function! s:NM_newBuffer(type, content)
- enew
+function! s:NM_newBuffer(how, type, content)
+ if strlen(a:how)
+ exec a:how
+ else
+ enew
+ endif
setlocal buftype=nofile readonly modifiable scrolloff=0 sidescrolloff=0
silent put=a:content
keepjumps 0d
let b:nm_type = a:type
endfunction
+function! s:NM_newComposeBuffer(lines, start_on_line)
+ let lines = a:lines
+ let start_on_line = a:start_on_line
+ let real_hdr_start = 1
+ if g:notmuch_compose_header_help
+ let help_lines = [
+ \ 'Notmuch-Help: Type in your message here; to help you use these bindings:',
+ \ 'Notmuch-Help: ,a - attach a file',
+ \ 'Notmuch-Help: ,s - send the message (Notmuch-Help lines will be removed)',
+ \ 'Notmuch-Help: ,q - abort the message',
+ \ 'Notmuch-Help: <Tab> - skip through header lines',
+ \ ]
+ call extend(lines, help_lines, 0)
+ let real_hdr_start = len(help_lines)
+ if start_on_line > 0
+ let start_on_line = start_on_line + len(help_lines)
+ endif
+ endif
+ call extend(lines, g:notmuch_signature)
+
+
+ let prev_bufnr = bufnr('%')
+ setlocal bufhidden=hide
+ call <SID>NM_newFileBuffer(g:notmuch_compose_temp_file_dir, '%s.mail',
+ \ 'compose', lines)
+ setlocal bufhidden=hide
+ let b:nm_prev_bufnr = prev_bufnr
+
+ call <SID>NM_set_map('n', g:notmuch_compose_nmaps)
+ call <SID>NM_set_map('i', g:notmuch_compose_imaps)
+
+ if start_on_line > 0 && start_on_line <= len(lines)
+ call cursor(start_on_line, strlen(getline(start_on_line)) + 1)
+ else
+ call cursor(real_hdr_start, strlen(getline(real_hdr_start)) + 1)
+ call <SID>NM_compose_next_entry_area()
+ endif
+
+ if g:notmuch_compose_insert_mode_start
+ startinsert!
+ endif
+ echo 'Type your message, use <TAB> to jump to next header and then body.'
+endfunction
+
+function! s:NM_assert_buffer_type(type)
+ if !exists('b:nm_type') || b:nm_type != a:type
+ throw printf('Eeek! expected type %s, but got %s.', a:type,
+ \ exists(b:nm_type) ? b:nm_type : 'something else')
+ endif
+endfunction
+
function! s:NM_mktemp(dir, name)
let time_stamp = strftime('%Y%m%d-%H%M%S')
let file_name = substitute(a:dir,'/*$','/','') . printf(a:name, time_stamp)
call map(words, 's:NM_shell_escape(v:val)')
let cmd = g:notmuch_cmd . ' ' . join(words) . '< /dev/null'
- let start = reltime()
- let out = system(cmd)
- let err = v:shell_error
- let delta = reltime(start)
-
if exists('g:notmuch_debug') && g:notmuch_debug
+ let start = reltime()
+ let out = system(cmd)
+ let err = v:shell_error
+ let delta = reltime(start)
+
echo printf('[%s] {%s} %s', reltimestr(delta), string(err), string(cmd))
+ else
+ let out = system(cmd)
+ let err = v:shell_error
endif
if err
" --- external mail handling helpers {{{1
function! s:NM_new_mail()
- echo 'not implemented'
+ call <SID>NM_cmd_compose([], [])
+endfunction
+
+" --- tag manipulation helpers {{{1
+
+" used to combine an array of words with prefixes and separators
+" example:
+" NM_combine_tags('tag:', ['one', 'two', 'three'], 'OR', '()')
+" -> ['(', 'tag:one', 'OR', 'tag:two', 'OR', 'tag:three', ')']
+function! s:NM_combine_tags(word_prefix, words, separator, brackets)
+ let res = []
+ for word in a:words
+ if len(res) && strlen(a:separator)
+ call add(res, a:separator)
+ endif
+ call add(res, a:word_prefix . word)
+ endfor
+ if len(res) > 1 && strlen(a:brackets)
+ if strlen(a:brackets) != 2
+ throw 'Eeek! brackets arg to NM_combine_tags must be 2 chars'
+ endif
+ call insert(res, a:brackets[0])
+ call add(res, a:brackets[1])
+ endif
+ return res
endfunction
" --- other helpers {{{1
+function! s:NM_get_search_words()
+ if !exists('b:nm_search_words')
+ throw 'Eeek! no b:nm_search_words'
+ endif
+ return b:nm_search_words
+endfunction
+
function! s:NM_kill_this_buffer()
if exists('b:nm_prev_bufnr')
- setlocal bufhidden=delete
- exec printf(":buffer %d", b:nm_prev_bufnr)
+ let prev_bufnr = b:nm_prev_bufnr
+ bdelete!
+ exec printf("buffer %d", prev_bufnr)
else
echo "This is the last buffer; use :q<CR> to quit."
endif
let b:nm_prev_bufnr = prev_bufnr
endfunction
-function! s:NM_add_remove_tags(filter, prefix, tags)
+function! s:NM_tag(filter, tags)
let filter = len(a:filter) ? a:filter : [<SID>NM_search_thread_id()]
if !len(filter)
- echoe 'Eeek! I couldn''t find the thead id!'
+ throw 'Eeek! I couldn''t find the thread id!'
endif
- call map(a:tags, 'a:prefix . v:val')
let args = ['tag']
call extend(args, a:tags)
call add(args, '--')
call <SID>NM_run(args)
endfunction
-function! s:NM_add_remove_tags_on_screen(online, prefix, tags)
- setlocal modifiable
- if a:prefix == '-'
- for tagname in a:tags
- exec printf('silent! %ss/(\([^)]*\)\<%s\>\([^)]*\))$/(\1\2)/', string(a:online), tagname)
- endfor
- else
- for tagname in a:tags
- exec printf('silent! %ss/(\([^)]*\)\([^)]*\))$/(\1 %s)/', string(a:online), tagname)
- endfor
- endif
- setlocal nomodifiable
-endfunction
-
" --- process and set the defaults {{{1
function! NM_set_defaults(force)
exec printf('%snoremap <buffer> %s %s', a:type, key, code)
endfor
" --- this is a hack for development :)
- nnoremap ,nmr :source ~/.vim/plugin/notmuch.vim<CR>:call NotMuch('')<CR>
+ nnoremap ,nmr :runtime! plugin/notmuch.vim<CR>
endfunction
" --- command handler {{{1
projects / notmuch / blobdiff