From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 2 Nov 2013 06:52:22 +0000 (-0600)
Subject: vim: move default sets to set_defaults()
X-Git-Tag: 0.17_rc1~10
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=8d3b4ffb562fb7625304622d4a7421a7b1923135

vim: move default sets to set_defaults()

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---

diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index 2fe9346e..71d4b321 100644
--- a/vim/notmuch.vim
+++ b/vim/notmuch.vim
@@ -60,26 +60,6 @@ let s:notmuch_reader_default = 'mutt -f %s'
 let s:notmuch_sendmail_default = 'sendmail'
 let s:notmuch_folders_count_threads_default = 0
 
-if !exists('g:notmuch_date_format')
-	let g:notmuch_date_format = s:notmuch_date_format_default
-endif
-
-if !exists('g:notmuch_datetime_format')
-	let g:notmuch_datetime_format = s:notmuch_datetime_format_default
-endif
-
-if !exists('g:notmuch_reader')
-	let g:notmuch_reader = s:notmuch_reader_default
-endif
-
-if !exists('g:notmuch_sendmail')
-	let g:notmuch_sendmail = s:notmuch_sendmail_default
-endif
-
-if !exists('g:notmuch_folders_count_threads')
-	let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default
-endif
-
 function! s:new_file_buffer(type, fname)
 	exec printf('edit %s', a:fname)
 	execute printf('set filetype=notmuch-%s', a:type)
@@ -410,6 +390,26 @@ endfunction
 "" root
 
 function! s:set_defaults()
+	if !exists('g:notmuch_date_format')
+		let g:notmuch_date_format = s:notmuch_date_format_default
+	endif
+
+	if !exists('g:notmuch_datetime_format')
+		let g:notmuch_datetime_format = s:notmuch_datetime_format_default
+	endif
+
+	if !exists('g:notmuch_reader')
+		let g:notmuch_reader = s:notmuch_reader_default
+	endif
+
+	if !exists('g:notmuch_sendmail')
+		let g:notmuch_sendmail = s:notmuch_sendmail_default
+	endif
+
+	if !exists('g:notmuch_folders_count_threads')
+		let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default
+	endif
+
 	if exists('g:notmuch_custom_search_maps')
 		call extend(g:notmuch_search_maps, g:notmuch_custom_search_maps)
 	endif