vim: return nothing instead of failting if there is no message id

[notmuch] / vim / plugin / notmuch.vim

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index d2650855092e42beef62548481b69a16a04b8b01..3ceefe58f411fefa3339a75db379dd0769066949 100644 (file)
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -23,6 +23,7 @@
 
 let s:notmuch_defaults = {
         \ 'g:notmuch_cmd':                           'notmuch'                    ,
 
 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                           ,
         \
         \ 'g:notmuch_search_newest_first':           1                            ,
         \ 'g:notmuch_search_from_column_width':      20                           ,


@@ -128,6 +129,10 @@ let g:notmuch_show_maps = {
         \ '<Space>':    ':call <SID>NM_show_advance_marking_read_and_archiving()<CR>',
         \ '\|':         ':call <SID>NM_show_pipe_message()<CR>',
         \
         \ '<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_message_id() . ''  @ '' . join(<SID>NM_show_search_words())<CR>',
         \ 'r':          ':call <SID>NM_show_reply()<CR>',
         \ 'm':          ':call <SID>NM_new_mail()<CR>',
         \ '?':          ':echo <SID>NM_show_message_id() . ''  @ '' . join(<SID>NM_show_search_words())<CR>',


@@ -230,7 +235,13 @@ endfunction
 function! s:NM_search_show_thread()
         let id = <SID>NM_search_thread_id()
         if id != ''
 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
 
         endif
 endfunction
 


@@ -488,16 +499,21 @@ function! s:NM_show_pipe_message()
         echo 'not implemented'
 endfunction
 
         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
 
 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'
 function! s:NM_show_message_id()
         if !exists('b:nm_raw_info')
                 echoe 'no b:nm_raw_info'


@@ -509,8 +525,10 @@ function! s:NM_show_message_id()
                 if lnum > msg['end']
                         continue
                 endif
                 if lnum > msg['end']
                         continue
                 endif

-
-                return msg['id']
+                if has_key(msg,'id')
+                        return msg['id']
+                endif
+                return ''

         endfor
         return ''
 endfunction
         endfor
         return ''
 endfunction


@@ -780,7 +798,9 @@ function! s:NM_run(args)
         let err = v:shell_error
         let delta = reltime(start)
 
         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
 
         if err
                 echohl Error