\ '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_tags_regexp': '(\([^)]*\))$' ,
\
\ 'g:notmuch_show_citation_regexp': '^\s*>' ,
\
+ \ 'g:notmuch_compose_insert_mode_start': 1 ,
+ \ 'g:notmuch_compose_header_help': 1 ,
\ 'g:notmuch_compose_temp_file_dir': '~/.notmuch/compose/' ,
\ }
" --- --- 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>',
\ }
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
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
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_raw_info = info
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')
function! s:NM_show_search_words()
if !exists('b:nm_words')
- echoe 'no b:nm_words'
- return []
+ throw 'Eeek! no b:nm_words'
endif
return b:nm_words
endfunction
" --- implement compose screen {{{1
function! s:NM_cmd_compose(words, body_lines)
- let lines = []
+ let lines = !g:notmuch_compose_header_help ? [] : [
+ \ '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',
+ \ ]
let start_on_line = 0
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
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_cmd_compose_mksyntax()
call <SID>NM_set_map('n', g:notmuch_compose_nmaps)
call <SID>NM_set_map('i', g:notmuch_compose_imaps)
- exec printf('norm %dG', start_on_line)
- startinsert!
+ call cursor(start_on_line, strlen(start_on_line) + 1)
+ 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_cmd_compose_mksyntax()
- silent! setlocal syntax=mail
-endfunction
function! s:NM_compose_send()
+ call <SID>NM_assert_buffer_type('compose')
+ let fname = expand('%')
+ let lnum = 1
+ let line = getline(lnum)
+ let hdrs = {}
+ let lst_hdr = ''
+ while match(line, '^$') == -1
+ if match(line, '^Notmuch-Help:') != -1
+ " skip it
+ elseif strlen(lst_hdr) && match(line, '^\s') != -1
+ let hdrs[lst_hdr][-1] = hdrs[lst_hdr][-1] . substitute(line, '^\s*', ' ', '')
+ else
+ let m = matchlist(line, '^\(\w[^:]*\):\s*\(.*\)\s*$')
+ if !len(m)
+ cursor(lnum, 0)
+ throw printf('Eeek! invalid header on line %d', lnum)
+ endif
+ let key = substitute(m[1], '\<\w', '\U&', 'g')
+ if strlen(m[2])
+ if !has_key(hdrs, key)
+ let hdrs[key] = []
+ endif
+ call add(hdrs[key], m[2])
+ endif
+ let lst_hdr = key
+ endif
+ let lnum = lnum + 1
+ let line = getline(lnum)
+ endwhile
+ let body_starts = lnum + 1
+ exec printf('0,%dd', body_starts)
+ write
+
+ "[-a header] [-b bcc-addr] [-c cc-addr] [-s subject] to-addr
+ let cmd = ['mail']
+ let tos = []
+ for [key, vals] in items(hdrs)
+ if key == 'To'
+ call extend(tos, vals)
+ elseif key == 'Bcc'
+ for adr in vals
+ call add(cmd, '-b')
+ call add(cmd, adr)
+ endfor
+ elseif key == 'Cc'
+ for adr in vals
+ call add(cmd, '-c')
+ call add(cmd, adr)
+ endfor
+ elseif key == 'Subject'
+ for txt in vals
+ call add(cmd, '-s')
+ call add(cmd, txt)
+ endfor
+ else
+ for val in vals
+ call add(cmd, '-a')
+ call add(cmd, key . ': ' . val)
+ endfor
+ endif
+ endfor
+ call extend(cmd, tos)
+
+ call map(cmd, 's:NM_shell_escape(v:val)')
+ let cmdtxt = join(cmd) . '< ' . 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_attach()
echo 'not implemented'
endfunction
call cursor(lnum+1, strlen(getline(lnum+1)) + 1)
return ''
endif
- echo 'mode=' . mode()
if mode() == 'i'
if !getbufvar(bufnr('.'), '&et')
return "\t"
" --- 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_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)
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
endfor
else
for tagname in a:tags
- exec printf('silent! %ss/(\([^)]*\)\([^)]*\))$/(\1 %s)/', string(a:online), tagname)
+ exec printf('silent! %ss/(\([^)]*\))$/(\1 %s)/', string(a:online), tagname)
endfor
endif
setlocal nomodifiable
projects / notmuch / blobdiff