Merge branch 'session_issue' of https://github.com/grota/lusty into g…

…rota-session_issue
sjbach · Jun 3, 2012 · c48ab27 · c48ab27
2 parents c3c2e73 + 059be5c
commit c48ab27
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/plugin/lusty-explorer.vim b/plugin/lusty-explorer.vim
@@ -322,7 +322,7 @@ endfunction
 " Setup the autocommands that handle buffer MRU ordering.
 augroup LustyExplorer
   autocmd!
-  autocmd BufEnter * ruby LustyE::profile() { $le_buffer_stack.push }
+  autocmd BufAdd,BufEnter * ruby LustyE::profile() { $le_buffer_stack.push }
   autocmd BufDelete * ruby LustyE::profile() { $le_buffer_stack.pop }
   autocmd BufWipeout * ruby LustyE::profile() { $le_buffer_stack.pop }
 augroup End
@@ -2356,12 +2356,13 @@ class BufferStack
     end
 
     def push
-      @stack.delete $curbuf.number
-      @stack << $curbuf.number
+      buf_number = VIM::evaluate('expand("<abuf>")').to_i
+      @stack.delete buf_number
+      @stack << buf_number
     end
 
     def pop
-      number = VIM::evaluate('bufnr(expand("<afile>"))')
+      number = VIM::evaluate('bufnr(expand("<abuf>"))')
       @stack.delete number
     end
 

diff --git a/plugin/lusty-juggler.vim b/plugin/lusty-juggler.vim
@@ -287,7 +287,7 @@ endfunction
 " Setup the autocommands that handle buffer MRU ordering.
 augroup LustyJuggler
   autocmd!
-  autocmd BufEnter * ruby LustyJ::profile() { $lj_buffer_stack.push }
+  autocmd BufAdd,BufEnter * ruby LustyJ::profile() { $lj_buffer_stack.push }
   autocmd BufDelete * ruby LustyJ::profile() { $lj_buffer_stack.pop }
   autocmd BufWipeout * ruby LustyJ::profile() { $lj_buffer_stack.pop }
 augroup End
@@ -1250,12 +1250,13 @@ class BufferStack
     end
 
     def push
-      @stack.delete $curbuf.number
-      @stack << $curbuf.number
+      buf_number = VIM::evaluate('expand("<abuf>")').to_i
+      @stack.delete buf_number
+      @stack << buf_number
     end
 
     def pop
-      number = VIM::evaluate('bufnr(expand("<afile>"))')
+      number = VIM::evaluate('bufnr(expand("<abuf>"))')
       @stack.delete number
     end
 

diff --git a/src/explorer.vim b/src/explorer.vim
@@ -322,7 +322,7 @@ endfunction
 " Setup the autocommands that handle buffer MRU ordering.
 augroup LustyExplorer
   autocmd!
-  autocmd BufEnter * ruby LustyE::profile() { $le_buffer_stack.push }
+  autocmd BufAdd,BufEnter * ruby LustyE::profile() { $le_buffer_stack.push }
   autocmd BufDelete * ruby LustyE::profile() { $le_buffer_stack.pop }
   autocmd BufWipeout * ruby LustyE::profile() { $le_buffer_stack.pop }
 augroup End

diff --git a/src/juggler.vim b/src/juggler.vim
@@ -287,7 +287,7 @@ endfunction
 " Setup the autocommands that handle buffer MRU ordering.
 augroup LustyJuggler
   autocmd!
-  autocmd BufEnter * ruby LustyJ::profile() { $lj_buffer_stack.push }
+  autocmd BufAdd,BufEnter * ruby LustyJ::profile() { $lj_buffer_stack.push }
   autocmd BufDelete * ruby LustyJ::profile() { $lj_buffer_stack.pop }
   autocmd BufWipeout * ruby LustyJ::profile() { $lj_buffer_stack.pop }
 augroup End

diff --git a/src/lusty/buffer-stack.rb b/src/lusty/buffer-stack.rb
@@ -62,12 +62,13 @@ def length
     end
 
     def push
-      @stack.delete $curbuf.number
-      @stack << $curbuf.number
+      buf_number = VIM::evaluate('expand("<abuf>")').to_i
+      @stack.delete buf_number
+      @stack << buf_number
     end
 
     def pop
-      number = VIM::evaluate('bufnr(expand("<afile>"))')
+      number = VIM::evaluate('bufnr(expand("<abuf>"))')
       @stack.delete number
     end