X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fplugin%2Fnotmuch.vim;h=b63417b8bf0464ae693f3c5913a773540431a7dd;hp=47a226100180b8a566995548d2103ab00c08ba03;hb=a04334e95903cfeb4f26d1820eeeb0ed63487dea;hpb=b5e28d86153c15461f277ef1b0b827d3fe4a5fc1

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 47a22610..b63417b8 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -33,17 +33,17 @@ let s:notmuch_defaults = {
         \ 'g:notmuch_show_fold_bodies':              0                            ,
         \ 'g:notmuch_show_fold_headers':             1                            ,
         \
-        \ 'g:notmuch_show_message_begin_regexp':     '^message{'                ,
-        \ 'g:notmuch_show_message_end_regexp':       '^message}'                ,
-        \ 'g:notmuch_show_header_begin_regexp':      '^header{'                 ,
-        \ 'g:notmuch_show_header_end_regexp':        '^header}'                 ,
-        \ 'g:notmuch_show_body_begin_regexp':        '^body{'                   ,
-        \ 'g:notmuch_show_body_end_regexp':          '^body}'                   ,
-        \ 'g:notmuch_show_attachment_begin_regexp':  '^attachment{'             ,
-        \ 'g:notmuch_show_attachment_end_regexp':    '^attachment}'             ,
-        \ 'g:notmuch_show_part_begin_regexp':        '^part{'                   ,
-        \ 'g:notmuch_show_part_end_regexp':          '^part}'                   ,
-        \ 'g:notmuch_show_marker_regexp':            '^\\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$',
+        \ 'g:notmuch_show_message_begin_regexp':     'message{'                ,
+        \ 'g:notmuch_show_message_end_regexp':       'message}'                ,
+        \ 'g:notmuch_show_header_begin_regexp':      'header{'                 ,
+        \ 'g:notmuch_show_header_end_regexp':        'header}'                 ,
+        \ 'g:notmuch_show_body_begin_regexp':        'body{'                   ,
+        \ 'g:notmuch_show_body_end_regexp':          'body}'                   ,
+        \ 'g:notmuch_show_attachment_begin_regexp':  'attachment{'             ,
+        \ 'g:notmuch_show_attachment_end_regexp':    'attachment}'             ,
+        \ 'g:notmuch_show_part_begin_regexp':        'part{'                   ,
+        \ 'g:notmuch_show_part_end_regexp':          'part}'                   ,
+        \ 'g:notmuch_show_marker_regexp':            '\\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$',
         \
         \ 'g:notmuch_show_message_parse_regexp':     '\(id:[^ ]*\) depth:\([0-9]*\) match:\([0-9]*\) filename:\(.*\)$',
         \ 'g:notmuch_show_tags_regexp':              '(\([^)]*\))$'               ,
@@ -1232,7 +1232,7 @@ endfunction
 function! s:NM_kill_this_buffer()
         if exists('b:nm_prev_bufnr')
                 let prev_bufnr = b:nm_prev_bufnr
-                bdelete
+                bdelete!
                 exec printf("buffer %d", prev_bufnr)
         else
                 echo "This is the last buffer; use :q<CR> to quit."
@@ -1270,7 +1270,7 @@ function! s:NM_add_remove_tags_on_screen(online, prefix, tags)
                 endfor
         else
                 for tagname in a:tags
-                        exec printf('silent! %ss/(\([^)]*\)\([^)]*\))$/(\1 %s)/', string(a:online), tagname)
+                        exec printf('silent! %ss/(\([^)]*\))$/(\1 %s)/', string(a:online), tagname)
                 endfor
         endif
         setlocal nomodifiable