X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fplugin%2Fnotmuch.vim;fp=vim%2Fplugin%2Fnotmuch.vim;h=f29dff1c1b995e11f43e9c3f819c73ddd3a311f0;hp=4ad992beab607a559b0548ae2f73610ec82147db;hb=6c6c8a9c8589ee0a56469e8d8e7a31bd038eb3ae;hpb=3de487d405f7bf57e959d58ae856afcce6e277fe

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 4ad992be..f29dff1c 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -796,7 +796,14 @@ function! s:NM_cmd_show_parse(inlines)
                                 endif
                                 call add(info['disp'],
                                          \ printf('--- %s ---', in_part))
-                                let part_start = len(info['disp']) + 1
+                                " We don't yet handle nested parts, so pop
+                                " multipart/* immediately so text/plain
+                                " sub-parts are parsed properly
+                                if match(in_part, '^multipart/') != -1
+                                        let in_part = ''
+                                else
+                                        let part_start = len(info['disp']) + 1
+                                endif
                         endif
 
                 elseif in_header