From be19c210ca1cb7e4fe1de5ab5847fabbedbacc9a Mon Sep 17 00:00:00 2001
From: Bart Trojanowski <bart@jukie.net>
Date: Mon, 23 Nov 2009 20:24:22 -0500
Subject: [PATCH] vim: fix '?' command in message display

---
 vim/plugin/notmuch.vim | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 47bb4caf..d2650855 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -130,7 +130,7 @@ let g:notmuch_show_maps = {
         \
         \ '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>',
         \ }
 
 
@@ -506,7 +506,7 @@ 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
 
@@ -515,6 +515,14 @@ function! s:NM_show_message_id()
         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'
-- 
2.26.2