]> git.notmuchmail.org Git - notmuch/blobdiff - vim/plugin/notmuch.vim
vim: cleanup error messages
[notmuch] / vim / plugin / notmuch.vim
index b70c6edcb8e32c618527703e657ad499635ce5b0..95e9c98cfd952428cfa165f5c8ff16702fd95289 100644 (file)
@@ -33,17 +33,17 @@ let s:notmuch_defaults = {
         \ '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':              '(\([^)]*\))$'               ,
@@ -175,7 +175,7 @@ let g:notmuch_compose_imaps = {
 
 function! s:NM_cmd_folders(words)
         if len(a:words)
-                echoe 'Not exapecting any arguments for folders command.'
+                throw 'Not exapecting any arguments for folders command.'
         endif
         let cmd = ['count']
         let disp = []
@@ -188,7 +188,7 @@ function! s:NM_cmd_folders(words)
                 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()
 
@@ -236,7 +236,7 @@ function! s:NM_cmd_search(words)
         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
 
@@ -387,7 +387,6 @@ function! s:NM_search_thread_id()
         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
@@ -418,7 +417,7 @@ function! s:NM_cmd_show(words)
         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
@@ -539,7 +538,7 @@ function! s:NM_show_advance_marking_read_and_archiving()
 
         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
@@ -562,7 +561,7 @@ function! s:NM_show_advance_marking_read_and_archiving()
 
         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
@@ -886,7 +885,7 @@ function! s:NM_cmd_compose(words, body_lines)
 
         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
@@ -936,6 +935,7 @@ function! s:NM_cmd_compose(words, body_lines)
         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)
@@ -948,7 +948,99 @@ function! s:NM_cmd_compose(words, body_lines)
 endfunction
 
 function! s:NM_compose_send()
-        echo 'not implemented'
+        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()
@@ -958,7 +1050,6 @@ 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)
@@ -1013,8 +1104,12 @@ endfunction
 
 " --- 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
@@ -1040,6 +1135,13 @@ function! s:NM_newFileBuffer(fdir, fname, type, lines)
         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)
@@ -1127,8 +1229,9 @@ 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
@@ -1146,7 +1249,7 @@ endfunction
 function! s:NM_add_remove_tags(filter, prefix, 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 thead id!'
         endif
         call map(a:tags, 'a:prefix . v:val')
         let args = ['tag']
@@ -1165,7 +1268,7 @@ function! s:NM_add_remove_tags_on_screen(online, prefix, tags)
                 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