X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fplugin%2Fnotmuch.vim;h=3ceefe58f411fefa3339a75db379dd0769066949;hp=0addd76aca9bd1f9716fb52daf7cfa8e86988836;hb=9d9b03c837edde2aaed1cd9f8472d2be45c406bf;hpb=6bc0ec618d55aed84b1b0a810c0f1ac877a4e430

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 0addd76a..3ceefe58 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -23,6 +23,7 @@
 
 let s:notmuch_defaults = {
         \ 'g:notmuch_cmd':                           'notmuch'                    ,
+        \ 'g:notmuch_debug':                         0                            ,
         \
         \ 'g:notmuch_search_newest_first':           1                            ,
         \ 'g:notmuch_search_from_column_width':      20                           ,
@@ -128,9 +129,13 @@ let g:notmuch_show_maps = {
         \ '<Space>':    ':call <SID>NM_show_advance_marking_read_and_archiving()<CR>',
         \ '\|':         ':call <SID>NM_show_pipe_message()<CR>',
         \
+        \ '<S-Tab>':    ':call <SID>NM_show_previous_fold()<CR>',
+        \ '<Tab>':      ':call <SID>NM_show_next_fold()<CR>',
+        \ '<Enter>':    ':call <SID>NM_show_toggle_fold()<CR>',
+        \
         \ 'r':          ':call <SID>NM_show_reply()<CR>',
         \ 'm':          ':call <SID>NM_new_mail()<CR>',
-        \ '?':          ':echo <SID>NM_show_thread_id() . '' '' . <SID>NM_show_message_id()<CR>',
+        \ '?':          ':echo <SID>NM_show_message_id() . ''  @ '' . join(<SID>NM_show_search_words())<CR>',
         \ }
 
 
@@ -218,7 +223,7 @@ function! s:NM_cmd_search_fmtline(line)
         if strlen(from) >= max
                 let from = substitute(m[3][0:max-4], '[^A-Za-z1-9_]*$', '', '') . '...'
         endif
-        return printf('%s %-20s | %s (%s)', m[2], from, m[4], m[5])
+        return printf('%-20s %-20s | %s (%s)', m[2], from, m[4], m[5])
 endfunction
 function! s:NM_cmd_search_mksyntax()
         syntax clear nmSearchFrom
@@ -230,7 +235,13 @@ endfunction
 function! s:NM_search_show_thread()
         let id = <SID>NM_search_thread_id()
         if id != ''
-                call <SID>NM_cmd_show([id])
+                let words = [id]
+                if exists('b:nm_search_words')
+                        let words = ['('] + b:nm_search_words + [')', 'and', id]
+                endif
+                if len(words)
+                        call <SID>NM_cmd_show(words)
+                endif
         endif
 endfunction
 
@@ -296,7 +307,7 @@ function! s:NM_search_filter_helper(prompt, prefix, joiner)
                         let idx = idx - 1
                 endwhile
         endif
-        let tags = b:nm_search_words + ['and', '''('] + tags + [')''']
+        let tags = b:nm_search_words + ['and', '('] + tags + [')']
 
         let prev_bufnr = bufnr('%')
         setlocal bufhidden=hide
@@ -488,16 +499,21 @@ function! s:NM_show_pipe_message()
         echo 'not implemented'
 endfunction
 
-" --- --- show screen helper functions {{{2
+function! s:NM_show_previous_fold()
+        echo 'not implemented'
+endfunction
 
-function! s:NM_show_thread_id()
-        if !exists('b:nm_words')
-                echoe 'no b:nm_words'
-                return ''
-        endif
-        return b:nm_words[0]
+function! s:NM_show_next_fold()
+        echo 'not implemented'
 endfunction
 
+function! s:NM_show_toggle_fold()
+        echo 'not implemented'
+endfunction
+
+
+" --- --- show screen helper functions {{{2
+
 function! s:NM_show_message_id()
         if !exists('b:nm_raw_info')
                 echoe 'no b:nm_raw_info'
@@ -506,15 +522,25 @@ function! s:NM_show_message_id()
         let info = b:nm_raw_info
         let lnum = line('.')
         for msg in info['msgs']
-                if lnum >= msg['start']
+                if lnum > msg['end']
                         continue
                 endif
-
-                return msg['id']
+                if has_key(msg,'id')
+                        return msg['id']
+                endif
+                return ''
         endfor
         return ''
 endfunction
 
+function! s:NM_show_search_words()
+        if !exists('b:nm_words')
+                echoe 'no b:nm_words'
+                return []
+        endif
+        return b:nm_words
+endfunction
+
 function! s:NM_show_fold_toggle(key, type, fold)
         let info = b:nm_raw_info
         let act = 'open'
@@ -757,15 +783,24 @@ function! s:NM_newBuffer(type, content)
         let b:nm_type = a:type
 endfunction
 
+function! s:NM_shell_escape(word)
+        let word = substitute(a:word, '''', '\\''', 'g')
+        return '''' . word . ''''
+endfunction
+
 function! s:NM_run(args)
-        let cmd = g:notmuch_cmd . ' ' . join(a:args) . '< /dev/null'
+        let words = a:args
+        call map(words, 's:NM_shell_escape(v:val)')
+        let cmd = g:notmuch_cmd . ' ' . join(words) . '< /dev/null'
 
         let start = reltime()
         let out = system(cmd)
         let err = v:shell_error
         let delta = reltime(start)
 
-        echo printf('[%s] {%s} %s', reltimestr(delta), string(err), string(cmd))
+        if exists('g:notmuch_debug') && g:notmuch_debug
+                echo printf('[%s] {%s} %s', reltimestr(delta), string(err), string(cmd))
+        endif
 
         if err
                 echohl Error