X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fplugin%2Fnotmuch.vim;h=2b92ad688dfbc5a3ba37c22d8107a9e35984e774;hp=865624fed01c698e90797b2894109d1c2ff29244;hb=c80ab27d08540d3f434629f62bdf2f6a13a1cf41;hpb=0265a0030348dbed4816d0619ac8806e76640184

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 865624fe..2b92ad68 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -25,27 +25,62 @@ if !exists('g:notmuch_cmd')
         let g:notmuch_cmd = 'notmuch'
 endif
 
+if !exists('g:notmuch_search_reverse')
+        let g:notmuch_search_reverse = 1
+endif
+
+" --- used to match output of notmuch
+
+let s:notmuch_show_message_begin_regexp    = '^message{'
+let s:notmuch_show_message_end_regexp      = '^message}'
+let s:notmuch_show_header_begin_regexp     = '^header{'
+let s:notmuch_show_header_end_regexp       = '^header}'
+let s:notmuch_show_body_begin_regexp       = '^body{'
+let s:notmuch_show_body_end_regexp         = '^body}'
+let s:notmuch_show_attachment_begin_regexp = '^attachment{'
+let s:notmuch_show_attachment_end_regexp   = '^attachment}'
+let s:notmuch_show_part_begin_regexp       = '^part{'
+let s:notmuch_show_part_end_regexp         = '^part}'
+let s:notmuch_show_marker_regexp           = '^\\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$'
+
+let s:notmuch_show_id_regexp               = '\(id:[^ ]*\)'
+let s:notmuch_show_depth_regexp            = ' depth:\([0-9]*\) '
+let s:notmuch_show_filename_regexp         = 'filename:\(.*\)$'
+let s:notmuch_show_tags_regexp             = '(\([^)]*\))$'
+
+let s:notmuch_show_signature_regexp        = '^\(-- \?\|_\+\)$'
+let s:notmuch_show_signature_lines_max     = 12
 
 " --- implement search screen
 
 function! s:NM_cmd_search(words)
-        let data = split(s:NM_run(['search'] + a:words), "\n")
-        let disp = copy(data)
+        let cmd = ['search']
+        if g:notmuch_search_reverse
+                let cmd = cmd + ['--reverse']
+        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 s:NM_newBuffer('search', join(disp, "\n"))
-        let b:nm_raw_data = data
+        let b:nm_raw_data = lines
 
         nnoremap <buffer> <Enter> :call <SID>NM_search_display()<CR>
+        nnoremap <buffer> s       :call <SID>NM_cmd_search(split(input('NotMuch Search:')))<CR>
+        setlocal cursorline
+        setlocal nowrap
 endfunction
 
 function! s:NM_search_display()
-        let line = line('.')
         if !exists('b:nm_raw_data')
                 echo 'no b:nm_raw_data'
         else
-                let info = b:nm_raw_data[line]
-                let what = split(info, '\W\+')[0]
+                let line = line('.')
+                let info = b:nm_raw_data[line-1]
+                let what = split(info, '\s\+')[0]
                 call s:NM_cmd_show([what])
         endif
 endfunction
@@ -54,24 +89,27 @@ endfunction
 " --- implement show screen
 
 function! s:NM_cmd_show(words)
+        let bufnr = bufnr('%')
         let data = s:NM_run(['show'] + a:words)
 
         call s:NM_newBuffer('show', data)
+        setlocal bufhidden=delete
         let b:nm_raw_data = data
+
+        exec printf("nnoremap <buffer> q :b %d<CR>", bufnr)
 endfunction
 
 
-" --- helper function
+" --- helper functions
 
 function! s:NM_newBuffer(ft, content)
         enew
         setlocal buftype=nofile readonly modifiable
-        setlocal bufhidden=delete
         silent put=a:content
         keepjumps 0d
         setlocal nomodifiable
-        setlocal cursorline
-        execute printf('setlocal filetype=notmuch-%s', a:ft)
+        execute printf('set filetype=notmuch-%s', a:ft)
+        execute printf('set syntax=notmuch-%s', a:ft)
 endfunction
 
 function! s:NM_run(args)