Seven years is more than enough.
Signed-off-by: Felipe Contreras <[email protected]>
---
vim/notmuch.vim | 50 +++++++++----------------------------------------
1 file changed, 9 insertions(+), 41 deletions(-)
diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index e717fb5a..717633c7 100644
--- a/vim/notmuch.vim
+++ b/vim/notmuch.vim
@@ -399,20 +399,16 @@ endfunction
"" root
function! s:set_defaults()
+ if !exists('g:notmuch_folders')
+ let g:notmuch_folders = s:notmuch_folders_default
+ endif
+
if !exists('g:notmuch_date_format')
- if exists('g:notmuch_rb_date_format')
- let g:notmuch_date_format = g:notmuch_rb_date_format
- else
- let g:notmuch_date_format =
s:notmuch_date_format_default
- endif
+ let g:notmuch_date_format = s:notmuch_date_format_default
endif
if !exists('g:notmuch_datetime_format')
- if exists('g:notmuch_rb_datetime_format')
- let g:notmuch_datetime_format =
g:notmuch_rb_datetime_format
- else
- let g:notmuch_datetime_format =
s:notmuch_datetime_format_default
- endif
+ let g:notmuch_datetime_format =
s:notmuch_datetime_format_default
endif
if !exists('g:notmuch_reply_quote_format')
@@ -424,41 +420,21 @@ function! s:set_defaults()
endif
if !exists('g:notmuch_reader')
- if exists('g:notmuch_rb_reader')
- let g:notmuch_reader = g:notmuch_rb_reader
- else
- let g:notmuch_reader = s:notmuch_reader_default
- endif
+ let g:notmuch_reader = s:notmuch_reader_default
endif
if !exists('g:notmuch_sendmail')
- if exists('g:notmuch_rb_sendmail')
- let g:notmuch_sendmail = g:notmuch_rb_sendmail
- else
- let g:notmuch_sendmail = s:notmuch_sendmail_default
- endif
+ let g:notmuch_sendmail = s:notmuch_sendmail_default
endif
if !exists('g:notmuch_folders_count_threads')
- if exists('g:notmuch_rb_count_threads')
- let g:notmuch_count_threads = g:notmuch_rb_count_threads
- else
- let g:notmuch_folders_count_threads =
s:notmuch_folders_count_threads_default
- endif
+ let g:notmuch_folders_count_threads =
s:notmuch_folders_count_threads_default
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
-
- if !exists('g:notmuch_custom_show_maps') &&
exists('g:notmuch_rb_custom_show_maps')
- let g:notmuch_custom_show_maps = g:notmuch_rb_custom_show_maps
- endif
-
if exists('g:notmuch_custom_search_maps')
call extend(g:notmuch_search_maps, g:notmuch_custom_search_maps)
endif
@@ -466,14 +442,6 @@ function! s:set_defaults()
if exists('g:notmuch_custom_show_maps')
call extend(g:notmuch_show_maps, g:notmuch_custom_show_maps)
endif
-
- if !exists('g:notmuch_folders')
- if exists('g:notmuch_rb_folders')
- let g:notmuch_folders = g:notmuch_rb_folders
- else
- let g:notmuch_folders = s:notmuch_folders_default
- endif
- endif
endfunction
function! s:NotMuch(...)
--
2.31.0
_______________________________________________
notmuch mailing list -- [email protected]
To unsubscribe send an email to [email protected]
