vim: remove unnecessary buffer queue

[notmuch] / vim / notmuch.vim

diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index 71d4b321de58490bce0e8e3ad2c601832498b2cb..9109470a9561eba268dcedc20426b59d9d3611da 100644 (file)
--- a/vim/notmuch.vim
+++ b/vim/notmuch.vim
@@ -65,7 +65,6 @@ function! s:new_file_buffer(type, fname)
        execute printf('set filetype=notmuch-%s', a:type)
        execute printf('set syntax=notmuch-%s', a:type)
        ruby $curbuf.init(VIM::evaluate('a:type'))
-       ruby $buf_queue.push($curbuf.number)
 endfunction
 
 function! s:compose_unload()
@@ -268,13 +267,8 @@ endfunction
 
 function! s:kill_this_buffer()
 ruby << EOF
-       if $buf_queue.size > 1
-               $curbuf.close
-               VIM::command("bdelete!")
-               $buf_queue.pop
-               b = $buf_queue.last
-               VIM::command("buffer #{b}") if b
-       end
+       $curbuf.close
+       VIM::command("bdelete!")
 EOF
 endfunction
 
@@ -293,7 +287,6 @@ function! s:new_buffer(type)
        execute printf('set filetype=notmuch-%s', a:type)
        execute printf('set syntax=notmuch-%s', a:type)
        ruby $curbuf.init(VIM::evaluate('a:type'))
-       ruby $buf_queue.push($curbuf.number)
 endfunction
 
 function! s:set_menu_buffer()
@@ -391,23 +384,51 @@ endfunction
 
 function! s:set_defaults()
        if !exists('g:notmuch_date_format')
-               let g:notmuch_date_format = s:notmuch_date_format_default
+               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
        endif
 
        if !exists('g:notmuch_datetime_format')
-               let g:notmuch_datetime_format = s:notmuch_datetime_format_default
+               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
        endif
 
        if !exists('g:notmuch_reader')
-               let g:notmuch_reader = s:notmuch_reader_default
+               if exists('g:notmuch_rb_reader')
+                       let g:notmuch_reader = g:notmuch_rb_reader
+               else
+                       let g:notmuch_reader = s:notmuch_reader_default
+               endif
        endif
 
        if !exists('g:notmuch_sendmail')
-               let g:notmuch_sendmail = s:notmuch_sendmail_default
+               if exists('g:notmuch_rb_sendmail')
+                       let g:notmuch_sendmail = g:notmuch_rb_sendmail
+               else
+                       let g:notmuch_sendmail = s:notmuch_sendmail_default
+               endif
        endif
 
        if !exists('g:notmuch_folders_count_threads')
-               let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default
+               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
+       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')
@@ -419,7 +440,11 @@ function! s:set_defaults()
        endif
 
        if !exists('g:notmuch_folders')
-               let g:notmuch_folders = s:notmuch_folders_default
+               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
 
@@ -439,7 +464,6 @@ ruby << EOF
        $db_name = nil
        $email = $email_name = $email_address = nil
        $searches = []
-       $buf_queue = []
        $threads = []
        $messages = []
        $config = {}