X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fnotmuch.vim;h=cad95178e29d18c4b142b5bc5948c6253f3a4b8a;hp=331e9300842b1ef62f0cc62baacdaf64da7ffe46;hb=f5db7ad7d243785c274a99734c681e69d13313d0;hpb=cc8c213bbc9572fa96c1b384225b69136a3fd0e4

diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index 331e9300..cad95178 100644
--- a/vim/notmuch.vim
+++ b/vim/notmuch.vim
@@ -59,6 +59,7 @@ let s:notmuch_datetime_format_default = '%d.%m.%y %H:%M:%S'
 let s:notmuch_reader_default = 'mutt -f %s'
 let s:notmuch_sendmail_default = 'sendmail'
 let s:notmuch_folders_count_threads_default = 0
+let s:notmuch_compose_start_insert_default = 1
 
 function! s:new_file_buffer(type, fname)
 	exec printf('edit %s', a:fname)
@@ -132,7 +133,9 @@ function! s:show_reply()
 	let b:compose_done = 0
 	call s:set_map(g:notmuch_compose_maps)
 	autocmd BufDelete <buffer> call s:on_compose_delete()
-	startinsert!
+	if g:notmuch_compose_start_insert
+		startinsert!
+	end
 endfunction
 
 function! s:compose()
@@ -140,7 +143,9 @@ function! s:compose()
 	let b:compose_done = 0
 	call s:set_map(g:notmuch_compose_maps)
 	autocmd BufDelete <buffer> call s:on_compose_delete()
-	startinsert!
+	if g:notmuch_compose_start_insert
+		startinsert!
+	end
 endfunction
 
 function! s:show_info()
@@ -428,6 +433,10 @@ function! s:set_defaults()
 		endif
 	endif
 
+	if !exists('g:notmuch_compose_start_insert')
+		let g:notmuch_compose_start_insert = s:notmuch_compose_start_insert_default
+	endif
+
 	if !exists('g:notmuch_custom_search_maps') && exists('g:notmuch_rb_custom_search_maps')
 		let g:notmuch_custom_search_maps = g:notmuch_rb_custom_search_maps
 	endif
@@ -471,28 +480,21 @@ ruby << EOF
 	$searches = []
 	$threads = []
 	$messages = []
-	$config = {}
 	$mail_installed = defined?(Mail)
 
-	def get_config
-		group = nil
-		config = ENV['NOTMUCH_CONFIG'] || '~/.notmuch-config'
-		File.open(File.expand_path(config)).each do |l|
-			l.chomp!
-			case l
-			when /^\[(.*)\]$/
-				group = $1
-			when ''
-			when /^(.*)=(.*)$/
-				key = "%s.%s" % [group, $1]
-				value = $2
-				$config[key] = value
-			end
-		end
+	def get_config_item(item)
+		result = ''
+		IO.popen(['notmuch', 'config', 'get', item]) { |out|
+			result = out.read
+		}
+		return result.rstrip
+	end
 
-		$db_name = $config['database.path']
-		$email_name = $config['user.name']
-		$email_address = $config['user.primary_email']
+	def get_config
+		$db_name = get_config_item('database.path')
+		$email_name = get_config_item('user.name')
+		$email_address = get_config_item('user.primary_email')
+		$email_name = get_config_item('user.name')
 		$email = "%s <%s>" % [$email_name, $email_address]
 	end