vim: have '?' show search words in search mode

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 95e9c98cfd952428cfa165f5c8ff16702fd95289..d406a7eb79525ce86767018b664d35325d8cbfa4 100644 (file)
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -127,7 +127,7 @@ let g:notmuch_search_maps = {
         \ '+':          ':call <SID>NM_search_add_tags([])<CR>',
         \ '-':          ':call <SID>NM_search_remove_tags([])<CR>',
         \ '=':          ':call <SID>NM_search_refresh_view()<CR>',
-        \ '?':          ':echo <SID>NM_search_thread_id()<CR>',
+        \ '?':          ':echo <SID>NM_search_thread_id() . ''  @ '' . join(<SID>NM_get_search_words())<CR>',
         \ }
 
 " --- --- bindings for show screen {{{2
@@ -157,7 +157,7 @@ let g:notmuch_show_maps = {
         \
         \ '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>',
+        \ '?':          ':echo <SID>NM_show_message_id() . ''  @ '' . join(<SID>NM_get_search_words())<CR>',
         \ }
 
 " --- --- bindings for compose screen {{{2
@@ -419,7 +419,7 @@ function! s:NM_cmd_show(words)
         setlocal bufhidden=hide
         call <SID>NM_newBuffer('', 'show', join(info['disp'], "\n"))
         setlocal bufhidden=delete
-        let b:nm_words = a:words
+        let b:nm_search_words = a:words
         let b:nm_raw_info = info
         let b:nm_prev_bufnr = prev_bufnr
 
@@ -628,13 +628,6 @@ function! s:NM_show_message_id()
         return ''
 endfunction
 
-function! s:NM_show_search_words()
-        if !exists('b:nm_words')
-                throw 'Eeek! no b:nm_words'
-        endif
-        return b:nm_words
-endfunction
-
 function! s:NM_show_fold_toggle(key, type, fold)
         let info = b:nm_raw_info
         let act = 'open'
@@ -1227,6 +1220,13 @@ endfunction
 
 " --- other helpers {{{1
 
+function! s:NM_get_search_words()
+        if !exists('b:nm_search_words')
+                throw 'Eeek! no b:nm_search_words'
+        endif
+        return b:nm_search_words
+endfunction
+
 function! s:NM_kill_this_buffer()
         if exists('b:nm_prev_bufnr')
                 let prev_bufnr = b:nm_prev_bufnr