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 aff492667b3d1db6773bbfebe79456b0d3fb277f..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'                    ,
+        \ 'g:notmuch_debug':                         0                            ,
         \
         \ '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>',
         \
+        \ '<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>',
@@ -494,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'
@@ -515,8 +525,10 @@ function! s:NM_show_message_id()
                 if lnum > msg['end']
                         continue
                 endif
-
-                return msg['id']
+                if has_key(msg,'id')
+                        return msg['id']
+                endif
+                return ''
         endfor
         return ''
 endfunction
@@ -786,7 +798,9 @@ function! s:NM_run(args)
         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