if id != ''
let words = [id]
if exists('b:nm_search_words')
- let words = ['('] + b:nm_search_words + [')', 'and', id]
+ let words = ['('] + b:nm_search_words + [')', 'AND', id]
endif
if len(words)
call <SID>NM_cmd_show(words)
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
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 + [')']
+ let filter = <SID>NM_combine_tags('tag:', advance_tags, 'OR', '()')
+ \ + ['AND']
+ \ + <SID>NM_combine_tags('', ids, 'OR', '()')
call <SID>NM_add_remove_tags(filter, '-', advance_tags)
call <SID>NM_show_next(1, 1)
return
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']]
+ let filter = <SID>NM_combine_tags('tag:', advance_tags, 'OR', '()')
+ \ + ['AND', msg_top['id']]
call <SID>NM_add_remove_tags(filter, '-', advance_tags)
endif
return
" --- implement compose screen {{{1
function! s:NM_cmd_compose(words, body_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 lines = []
let start_on_line = 0
let hdrs = { }
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
- 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)
- 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.'
+ call <SID>NM_newComposeBuffer(lines, start_on_line)
endfunction
function! s:NM_compose_send()
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,
echo 'not implemented'
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()
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