X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fplugin%2Fnotmuch.vim;h=70f38e2ac5a1a42768eafd5b7efab08401c8e295;hp=5fe438e78cf1eece676d160201c473738b2e9c2a;hb=89dc64726f9a396b0a0912788e1736141968c8b3;hpb=71bdd859dc6f80a918412396cb66c219e0e60669

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 5fe438e7..70f38e2a 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -99,17 +99,53 @@ function! s:NM_cmd_show(words)
         let b:nm_raw_data = data
 
         call s:NM_cmd_show_mkfolds()
+        setlocal foldtext=NM_cmd_show_foldtext()
+        setlocal fillchars=
+        setlocal foldcolumn=5
 
         exec printf("nnoremap <buffer> q :b %d<CR>", bufnr)
 endfunction
 
 function! s:NM_cmd_show_mkfolds()
+        let msg_start = -1
+        let hdr_start = -1
+        let bdy_start = -1
+        let prt_start = -1
         let modetype = ''
         let modeline = -1
         let lnum = 1
+        let b:nm_fold_data = {}
         while lnum <= line('$')
                 let line = getline(lnum)
-                if modetype == ''
+                if match(line, s:notmuch_show_message_begin_regexp) != -1
+                        let msg_start = lnum
+                elseif match(line, s:notmuch_show_message_end_regexp) != -1
+                        exec printf('%d,%dfold', msg_start, lnum)
+                        exec printf('%dfoldopen', msg_start)
+                        let b:nm_fold_data[msg_start] = ['msg', getline(msg_start)]
+
+                elseif match(line, s:notmuch_show_header_begin_regexp) != -1
+                        let hdr_start = lnum
+                elseif match(line, s:notmuch_show_header_end_regexp) != -1
+                        exec printf('%d,%dfold', hdr_start, lnum)
+                        exec printf('%dfoldclose', hdr_start)
+                        let b:nm_fold_data[hdr_start] = ['hdr', '* ' . getline(hdr_start+1) . ' [ Press "h" for full header. ]']
+
+                elseif match(line, s:notmuch_show_body_begin_regexp) != -1
+                        let bdy_start = lnum
+                elseif match(line, s:notmuch_show_body_end_regexp) != -1
+                        exec printf('%d,%dfold', bdy_start, lnum)
+                        exec printf('%dfoldopen', bdy_start)
+                        let b:nm_fold_data[bdy_start] = ['bdy', getline(bdy_start)]
+
+                elseif match(line, s:notmuch_show_part_begin_regexp) != -1
+                        let prt_start = lnum
+                elseif match(line, s:notmuch_show_part_end_regexp) != -1
+                        exec printf('%d,%dfold', prt_start, lnum)
+                        exec printf('%dfoldopen', prt_start)
+                        let b:nm_fold_data[msg_start] = ['msg', getline(prt_start)]
+
+                elseif modetype == ''
                         if match(line, s:notmuch_show_signature_regexp) != -1
                                 let modetype = 'sig'
                                 let modeline = lnum
@@ -120,13 +156,16 @@ function! s:NM_cmd_show_mkfolds()
                 elseif modetype == 'cit'
                         if match(line, s:notmuch_show_citation_regexp) == -1
                                 exec printf('%d,%dfold', modeline, lnum)
+                                let b:nm_fold_data[modeline] = [modetype, printf('[ %d-line citation.  Press "c" to show. ]', lnum - modeline)]
                                 let modetype = ''
                         endif
                 elseif modetype == 'sig'
                         if (lnum - modeline) > s:notmuch_show_signature_lines_max
                                 let modetype = ''
                         elseif match(line, s:notmuch_show_part_end_regexp) != -1
-                                exec printf('%d,%dfold', modeline, lnum)
+                                let modeline2 = lnum - 1
+                                exec printf('%d,%dfold', modeline, modeline2)
+                                let b:nm_fold_data[modeline] = [modetype, printf('[ %d-line signature.  Press "s" to show. ]', modeline2 - modeline)]
                                 let modetype = ''
                         endif
                 endif
@@ -135,6 +174,10 @@ function! s:NM_cmd_show_mkfolds()
         endwhile
 endfunction
 
+function! NM_cmd_show_foldtext()
+        return b:nm_fold_data[v:foldstart][1]
+endfunction
+
 
 " --- helper functions