X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=vim%2Fnotmuch.vim;h=25a16e9a4ec5b230d2879e3c5f27f69ee77a756d;hb=2fee62fd1fcaed5c9ec46daa4f24b33a2f310e83;hp=9109470a9561eba268dcedc20426b59d9d3611da;hpb=062a73b9312a4df84f61d1c998b365ceed92313b;p=notmuch

diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index 9109470a..25a16e9a 100644
--- a/vim/notmuch.vim
+++ b/vim/notmuch.vim
@@ -67,7 +67,7 @@ function! s:new_file_buffer(type, fname)
 	ruby $curbuf.init(VIM::evaluate('a:type'))
 endfunction
 
-function! s:compose_unload()
+function! s:on_compose_delete()
 	if b:compose_done
 		return
 	endif
@@ -126,7 +126,7 @@ function! s:show_reply()
 	ruby open_reply get_message.mail
 	let b:compose_done = 0
 	call s:set_map(g:notmuch_compose_maps)
-	autocmd BufUnload <buffer> call s:compose_unload()
+	autocmd BufDelete <buffer> call s:on_compose_delete()
 	startinsert!
 endfunction
 
@@ -134,7 +134,7 @@ function! s:compose()
 	ruby open_compose
 	let b:compose_done = 0
 	call s:set_map(g:notmuch_compose_maps)
-	autocmd BufUnload <buffer> call s:compose_unload()
+	autocmd BufDelete <buffer> call s:on_compose_delete()
 	startinsert!
 endfunction
 
@@ -633,7 +633,7 @@ ruby << EOF
 	def folders_render()
 		$curbuf.render do |b|
 			folders = VIM::evaluate('g:notmuch_folders')
-			count_threads = VIM::evaluate('g:notmuch_folders_count_threads')
+			count_threads = VIM::evaluate('g:notmuch_folders_count_threads') == 1
 			$searches.clear
 			folders.each do |name, search|
 				q = $curbuf.query(search)