vimamsa 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f68b029a6b5f374740c9afa2cb7c4ac628db4c4b9295b7e64db8294dac89659
-  data.tar.gz: c7c72c69ec7cd513e976caff3b0b1f2e619d890d8d84e616fcd747e4ab1193be
+  metadata.gz: 6000318b31060bff83029148c2cf47cc6ff8c5939d2fc1d54951a54e8b49a538
+  data.tar.gz: 500cd81fe9bd605276a0802f182980c5a93d77ab5d2221548586673e85a85832
 SHA512:
-  metadata.gz: 892b4011a44310ad05becbf108fce73d4cdda3a25d6241435b03519ad0dd264daa856502956f02f47386bce251aef3e0296cc682fc35b01fefa375fbffd5ee4a
-  data.tar.gz: 25c97fde0e225c7cb273bc0fa97d0db4d74376ea2ddca2baea8823dbb1e01d31334fabbaa8e319cc37d40eca23d37b3d64f2cbbbdcbbce88f7d30435cfb44a6f
+  metadata.gz: 8b687b1b72df46bd9bc35622b239e9525e2dc15884f1066557e82c474e99c280577a32a3a7f60a776f5b6be0866dc86c79e2b364780413821a491160ad73875f
+  data.tar.gz: d5e8da0e6263f74f27ee84781efdea5126411a68ace27d244da6c5b9203924196d10bbe91541319af91539089c6391dfadfde3f76cbac6f475b2002c1fbaa16c

data/exe/vimamsa

@@ -16,7 +16,9 @@ listen_dir = File.expand_path("~/.vimamsa/listen")
 if File.exist?(listen_dir) and !ARGV[0].nil?
   tmpf = Tempfile.new("vmarun", listen_dir)
   fp = tmpf.path
-  tmpf.write(ARGV[0])
+  paramfn = File.expand_path(ARGV[0])
+  puts paramfn
+  tmpf.write(paramfn)
   tmpf.close
   tstart = Time.new
   timeout = false
@@ -36,5 +38,5 @@ $LOAD_PATH.unshift(File.expand_path("ext"))
 require "vimamsa"
 # Ilib:ext
 # r rbvma -e "puts VMA.new.run"
-$vmag = VMAg.new()
+$vmag = VMAgui.new()
 $vmag.run

data/lib/vimamsa/ack.rb

@@ -16,10 +16,6 @@ def gui_ack()
   gui_one_input_action(nfo, "Search:", "search", callback)
 end
 
-def invoke_ack_search()
-  start_minibuffer_cmd("", "", :ack_buffer)
-end
-
 def ack_buffer(instr, b = nil)
   instr = instr.gsub("'", ".") # TODO
   bufstr = ""

data/lib/vimamsa/actions.rb

@@ -1,73 +1,62 @@
 class Action
-  attr_accessor :id, :method_name, :method
+  attr_accessor :id, :method_name, :method, :opt
 
-  def initialize(id, method_name, method, scope = [])
+  def initialize(id, method_name, method, opt = {})
     @method_name = method_name
     @id = id
     @method = method
+    @opt = opt
+
     $actions[id] = self
   end
 end
 
 $actions = {}
 
-# def reg_act(id, callfunc, name = "", scope = [])
-  # if callfunc.class == Proc
-    # a = Action.new(id, name, callfunc, scope)
-  # else
-    # a = Action.new(id, name, method(callfunc), scope)
-  # end
-# end
-
-def reg_act(id, callfunc, name = "", scope = [])
+def reg_act(id, callfunc, name = "", opt = {})
   if callfunc.class == Proc
-    a = Action.new(id, name, callfunc, scope)
+    a = Action.new(id, name, callfunc, opt)
   else
     begin
       m = method(callfunc)
     rescue NameError
       m = method("missing_callfunc")
     end
-    a = Action.new(id, name, m, scope)
+    a = Action.new(id, name, m, opt)
   end
+  return a
 end
 
 def missing_callfunc
-  puts "missing_callfunc"
+  debug "missing_callfunc"
 end
 
-
+#TODO: remove
 def call(id)
+  call_action(id)
+end
+
+def call_action(id)
   a = $actions[id]
   if a
-    #        Ripl.start :binding => binding
     a.method.call()
+  else
+    message("Unknown action: " + id.inspect)
   end
 end
 
 def search_actions()
   l = []
   $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
-  qt_select_update_window(l, $select_keys.collect { |x| x.upcase },
-                          "search_actions_select_callback",
-                          "search_actions_update_callback")
+  gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
+                           "search_actions_select_callback",
+                           "search_actions_update_callback")
 end
 
 $item_list = []
 
 def search_actions_update_callback(search_str = "")
-  #    item_list = $actions.collect {|x| x[1].id.to_s}
   return [] if search_str == ""
-  # item_list = $action_list.collect { |x|
-    # actname = x[:action].to_s
-    # if x[:action].class == Symbol
-      # mn = $actions[x[:action]].method_name
-      # actname = mn if mn.size > 0
-    # end
-    # r = { :str => actname, :key => x[:key], :action => x[:action] }
-  # }
-
-  # => {:str=>"insert_new_line", :key=>"I return", :action=>:insert_new_line}
 
   item_list2 = []
   for act_id in $actions.keys
@@ -81,16 +70,15 @@ def search_actions_update_callback(search_str = "")
     end
     item_list2 << item
   end
-  # Ripl.start :binding => binding
+
   item_list = item_list2
 
   a = filter_items(item_list, 0, search_str)
-  puts a.inspect
+  debug a.inspect
 
   r = a.collect { |x| [x[0][0], 0, x] }
-  puts r.inspect
+  debug r.inspect
   $item_list = r
-  # Ripl.start :binding => binding
 
   r = a.collect { |x| ["[#{x[0][:key]}] #{x[0][:str]}", 0, x] }
   return r
@@ -100,13 +88,13 @@ def search_actions_select_callback(search_str, idx)
   item = $item_list[idx][2]
   acc = item[0][:action]
 
-  puts "Selected:" + acc.to_s
-  qt_select_window_close(0)
+  debug "Selected:" + acc.to_s
+  gui_select_window_close(0)
 
   if acc.class == String
     eval(acc)
   elsif acc.class == Symbol
-    puts "Symbol"
+    debug "Symbol"
     call(acc)
   end
 end
@@ -118,7 +106,7 @@ def filter_items(item_list, item_key, search_str)
     [item, srn_dst(search_str, item[:str])]
   end
   scores.sort_by! { |x| -x[1] }
-  puts scores.inspect
+  debug scores.inspect
   scores = scores[0..30]
 
   return scores

data/lib/vimamsa/buffer.rb

@@ -1,5 +1,6 @@
 require "digest"
 require "tempfile"
+require "fileutils"
 require "pathname"
 require "openssl"
 require "ripl/multi_line"
@@ -15,7 +16,7 @@ class Buffer < String
 
   attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang
   attr_writer :call_func, :update_highlight
-  attr_accessor :qt_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :qt_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode, :title, :subtitle
+  attr_accessor :gui_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :gui_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode, :title, :subtitle
 
   @@num_buffers = 0
 
@@ -26,8 +27,8 @@ class Buffer < String
     @lang = nil
     @id = @@num_buffers
     @@num_buffers += 1
-    qt_create_buffer(@id)
-    puts "NEW BUFFER fn=#{fname} ID:#{@id}"
+    gui_create_buffer(@id)
+    debug "NEW BUFFER fn=#{fname} ID:#{@id}"
 
     @module = nil
 
@@ -58,7 +59,7 @@ class Buffer < String
     end
 
     t1 = Time.now
-    qt_set_current_buffer(@id)
+    gui_set_current_buffer(@id)
     gui_set_window_title(@title, @subtitle)
 
     set_content(str)
@@ -70,13 +71,29 @@ class Buffer < String
     @active_kbd_mode = nil
   end
 
+  def list_str()
+    if @fname.nil?
+      x = @title
+    else
+      x = @fname
+    end
+    return x
+  end
+
   def set_active
     if !@active_kbd_mode.nil?
       $kbd.set_mode(@active_kbd_mode)
     else
       $kbd.set_mode_to_default
     end
-    # qt_set_current_buffer(@id)
+    # gui_set_current_buffer(@id)
+  end
+
+  def set_executable
+    if File.exists?(@fname)
+      FileUtils.chmod("+x", @fname)
+      message("Set executable: #{@fname}")
+    end
   end
 
   def detect_file_language
@@ -96,7 +113,7 @@ class Buffer < String
     # lang.get_metadata("block-comment-end")
     @lang_nfo = lang
     if !lang.nil? and !lang.id.nil?
-      puts "Guessed LANG: #{lang.id}"
+      debug "Guessed LANG: #{lang.id}"
       @lang = lang.id
     end
 
@@ -105,11 +122,32 @@ class Buffer < String
     end
   end
 
+  def view()
+  	# Get the VSourceView < GtkSource::View object corresponding to this buffer
+    return vma.gui.buffers[@id]
+  end
+
   def add_image(imgpath, pos)
     return if !is_legal_pos(pos)
-    # insert_txt_at(" ", pos)
-    qt_process_deltas
-    qt_add_image(imgpath, pos)
+
+    pixbuf = GdkPixbuf::Pixbuf.new(:file => imgpath)
+
+    #  puts GdkPixbuf::InterpType.constants
+    # GdkPixbuf::InterpType::HYPER
+    # https://docs.gtk.org/gdk-pixbuf/enum.InterpType.html#bilinear
+    # https://docs.gtk.org/gdk-pixbuf/method.Pixbuf.scale_simple.html
+    imglimit = view.visible_rect.width - 5
+    if pixbuf.width > imglimit
+      nwidth = imglimit
+      nheight = (pixbuf.height * (imglimit.to_f / pixbuf.width)).to_i
+      pixbuf = pixbuf.scale_simple(nwidth, nheight, GdkPixbuf::InterpType::HYPER)
+    end
+
+    vbuf = view.buffer
+    itr = vbuf.get_iter_at(:offset => pos)
+    itr2 = vbuf.get_iter_at(:offset => pos + 1)
+    vbuf.delete(itr, itr2)
+    vbuf.insert(itr, pixbuf)
   end
 
   def is_legal_pos(pos, op = :read)
@@ -141,7 +179,6 @@ class Buffer < String
     b = " \n"
     txt = a + b
     insert_txt_at(txt, lr.end + 1)
-    qt_process_deltas
     imgpos = lr.end + 1 + a.size
     add_image(fname, imgpos)
   end
@@ -191,25 +228,25 @@ class Buffer < String
     ok = true
     @bt.each_line { |r|
       if lines[i] != r #or true
-        puts "NO MATCH FOR LINE:"
-        puts "i=#{i}["
-        # puts "[orig]pos=#{leaf.pos} |#{leaf.data}|"
-        # puts "spos=#{spos} nchar=#{leaf.nchar} epos=#{epos} a[]=\nr=|#{r}|"
-        puts "fromtree:|#{r}|"
-        puts "frombuf:|#{lines[i]}"
-        puts "]"
+        debug "NO MATCH FOR LINE:"
+        debug "i=#{i}["
+        # debug "[orig]pos=#{leaf.pos} |#{leaf.data}|"
+        # debug "spos=#{spos} nchar=#{leaf.nchar} epos=#{epos} a[]=\nr=|#{r}|"
+        debug "fromtree:|#{r}|"
+        debug "frombuf:|#{lines[i]}"
+        debug "]"
         ok = false
       end
       i += 1
     }
 
-    puts "BT: NO ERRORS" if ok
-    puts "BT: ERRORS" if !ok
+    debug "BT: NO ERRORS" if ok
+    debug "BT: ERRORS" if !ok
   end
 
   def set_content(str)
     @encrypted_str = nil
-    @qt_update_highlight = true
+    @gui_update_highlight = true
     @ftype = nil
     if str[0..10] == "VMACRYPT001"
       @encrypted_str = str[11..-1]
@@ -263,7 +300,7 @@ class Buffer < String
     @update_hl_startpos = 0 #TODO
     @update_hl_endpos = self.size - 1
 
-    qt_set_buffer_contents(@id, self.to_s)
+    gui_set_buffer_contents(@id, self.to_s)
 
     # add_hl_update(@update_hl_startpos, @update_hl_endpos)
   end
@@ -272,6 +309,12 @@ class Buffer < String
     @fname = filename
     @pathname = Pathname.new(fname) if @fname
     @basename = @pathname.basename if @fname
+
+    @title = File.basename(@fname)
+    @dirname = File.dirname(@fname)
+    userhome = File.expand_path("~")
+    @subtitle = @dirname.gsub(/^#{userhome}/, "~")
+
     detect_file_language
   end
 
@@ -417,11 +460,11 @@ class Buffer < String
   end
 
   def update_index(pos, changeamount)
-    # puts "pos #{pos}, changeamount #{changeamount}, @pos #{@pos}"
+    # debug "pos #{pos}, changeamount #{changeamount}, @pos #{@pos}"
     @edit_pos_history.collect! { |x| r = x if x <= pos; r = x + changeamount if x > pos; r }
     # TODO: handle between removal case
     for k in @marks.keys
-      #            puts "change(?): pos=#{pos}, k=#{k}, #{@marks[k]}, #{changeamount}"
+      #            debug "change(?): pos=#{pos}, k=#{k}, #{@marks[k]}, #{changeamount}"
       if @marks[k] > pos
         @marks[k] = @marks[k] + changeamount
       end
@@ -447,7 +490,6 @@ class Buffer < String
     return if @edit_pos_history.empty?
     @edit_pos_history_i -= 1
     @edit_pos_history_i = @edit_pos_history.size - 1 if @edit_pos_history_i < 0
-    #        Ripl.start :binding => binding
     debug "@edit_pos_history_i=#{@edit_pos_history_i}"
     set_pos(@edit_pos_history[-@edit_pos_history_i])
     center_on_current_line
@@ -563,8 +605,7 @@ class Buffer < String
     ls = nil
     ls = @line_ends[a] if a != nil
     # if a != nil and ls != @line_ends[a]
-    # puts "NO MATCH @line_ends[a]"
-    # Ripl.start :binding => binding
+    # debug "NO MATCH @line_ends[a]"
     # end
 
     if ls == nil
@@ -576,7 +617,6 @@ class Buffer < String
   end
 
   def get_line_end(pos)
-    #Ripl.start :binding => binding
     return @line_ends.select { |x| x > pos }.min
   end
 
@@ -670,7 +710,7 @@ class Buffer < String
     end
 
     debug "Scan line_end time: #{Time.now - t1}"
-    #puts @line_ends
+    #debug @line_ends
   end
 
   def sanity_check_line_ends()
@@ -687,7 +727,7 @@ class Buffer < String
   end
 
   def update_bufpos_on_change(positions, xpos, changeamount)
-    # puts "xpos=#{xpos} changeamount=#{changeamount}"
+    # debug "xpos=#{xpos} changeamount=#{changeamount}"
     positions.collect { |x|
       r = nil
       r = x if x < xpos
@@ -722,7 +762,7 @@ class Buffer < String
       i_nl = scan_indexes(changestr, /\n/)
       i_nl.collect! { |x| x + pos }
     end
-    #    puts "change:#{changeamount}"
+    #    debug "change:#{changeamount}"
     #TODO: this is the bottle neck in insert_txt action
     @line_ends.collect! { |x|
       r = nil
@@ -752,7 +792,7 @@ class Buffer < String
     elsif new_pos >= 0
       @pos = new_pos
     end
-    qt_set_cursor_pos(@id, @pos)
+    gui_set_cursor_pos(@id, @pos)
     calculate_line_and_column_pos
   end
 
@@ -870,10 +910,10 @@ class Buffer < String
         range = @pos..wmarks[0]
       end
     elsif range_id == :to_line_end
-      puts "TO LINE END"
+      debug "TO LINE END"
       range = @pos..(@line_ends[@lpos] - 1)
     elsif range_id == :to_line_start
-      puts "TO LINE START: #{@lpos}"
+      debug "TO LINE START: #{@lpos}"
 
       if @cpos == 0
         range = nil
@@ -909,15 +949,15 @@ class Buffer < String
   end
 
   def move(direction)
-    puts "cpos:#{@cpos} lpos:#{@lpos} @larger_cpos:#{@larger_cpos}"
+    debug "cpos:#{@cpos} lpos:#{@lpos} @larger_cpos:#{@larger_cpos}"
     if direction == :forward_page
-      puts "FORWARD PAGE"
+      debug "FORWARD PAGE"
       visible_range = get_visible_area()
       set_pos(visible_range[1])
       top_where_cursor()
     end
     if direction == :backward_page
-      puts "backward PAGE"
+      debug "backward PAGE"
       visible_range = get_visible_area()
       set_pos(visible_range[0])
       bottom_where_cursor()
@@ -1020,7 +1060,7 @@ class Buffer < String
     if wtype == :url
       open_url(word)
     elsif wtype == :linepointer
-      puts word.inspect
+      debug word.inspect
       jump_to_file(word[0], word[1])
     elsif wtype == :textfile
       open_existing_file(word)
@@ -1087,10 +1127,10 @@ class Buffer < String
     word_start = pos if word_start == nil
     word_end = pos if word_end == nil
     word = self[word_start..word_end]
-    puts "'WORD: #{word}'"
+    debug "'WORD: #{word}'"
     message("'#{word}'")
     linep = get_file_line_pointer(word)
-    puts "linep'#{linep}'"
+    debug "linep'#{linep}'"
     path = File.expand_path(word)
     wtype = nil
     if is_url(word)
@@ -1103,7 +1143,7 @@ class Buffer < String
         wtype = :file
       end
       # elsif hpt_check_cur_word(word) #TODO: check only
-      # puts word
+      # debug word
     elsif linep != nil
       wtype = :linepointer
       word = linep
@@ -1131,14 +1171,14 @@ class Buffer < String
     word_start = pos if word_start == nil
     word_end = pos if word_end == nil
     word = self[word_start..word_end]
-    puts "'#{word}'"
+    debug "'#{word}'"
     message("'#{word}'")
-    #puts wm
+    #debug wm
   end
 
   def jump_to_next_instance_of_word()
     if $kbd.last_action == $kbd.cur_action and @current_word != nil
-      # puts "REPEATING *"
+      # debug "REPEATING *"
     else
       start_search = [@pos - 150, 0].max
 
@@ -1237,10 +1277,10 @@ class Buffer < String
 
     if target == FIRST_NON_WHITESPACE
       l = current_line()
-      puts l.inspect
+      debug l.inspect
       @cpos = line(@lpos).size - 1
       a = scan_indexes(l, /\S/)
-      puts a.inspect
+      debug a.inspect
       if a.any?
         @cpos = a[0]
       else
@@ -1324,9 +1364,9 @@ class Buffer < String
     calculate_line_and_column_pos
   end
 
-  def execute_current_line_in_terminal()
+  def execute_current_line_in_terminal(autoclose = false)
     s = get_current_line
-    exec_in_terminal(s)
+    exec_in_terminal(s, autoclose)
   end
 
   def insert_new_line()
@@ -1346,8 +1386,17 @@ class Buffer < String
       # Indent start of new line based on last line
       last_line = line(@lpos)
       m = /^( +)([^ ]+|$)/.match(last_line)
-      debug m.inspect
-      c = c + " " * m[1].size if m
+      if m
+        c = c + " " * m[1].size if m
+      end
+
+      #if tab indent
+      m = /^(\t+)([^\t]+|$)/.match(last_line)
+      if m
+        c = c + "\t" * m[1].size if m
+      end
+
+      # debug m.inspect
     end
     if mode == BEFORE
       insert_pos = @pos
@@ -1360,8 +1409,8 @@ class Buffer < String
 
     #self.insert(insert_pos,c)
     add_delta([insert_pos, INSERT, c.size, c], true)
-    #puts("encoding: #{c.encoding}")
-    #puts "c.size: #{c.size}"
+    #debug("encoding: #{c.encoding}")
+    #debug "c.size: #{c.size}"
     #recalc_line_ends #TODO: optimize?
     calculate_line_and_column_pos
     #need_redraw!
@@ -1435,7 +1484,7 @@ class Buffer < String
         text = $register[register]
       end
     end
-    puts "PASTE: #{text}"
+    debug "PASTE: #{text}"
 
     return if text == ""
 
@@ -1481,7 +1530,6 @@ class Buffer < String
   def start_visual_mode()
     @visual_mode = true
     @selection_start = @pos
-    qt_set_selection_start(@id, selection_start)
     $kbd.set_mode(:visual)
   end
 
@@ -1491,7 +1539,13 @@ class Buffer < String
     return if !@visual_mode
 
     debug "COPY SELECTION"
-    set_clipboard(self[get_visual_mode_range])
+    s = self[get_visual_mode_range]
+    if x == :append
+      debug "APPEND"
+      s += "\n" + get_clipboard()
+    end
+
+    set_clipboard(s)
     end_visual_mode
     return true
   end
@@ -1636,10 +1690,14 @@ class Buffer < String
     else
       savepath = buflist.get_last_dir
     end
-    # Ripl.start :binding => binding
-    qt_file_saveas(savepath)
+    gui_file_saveas(savepath)
     # calls back to file_saveas
-    # TODO:?
+  end
+
+  def save_as_callback(fpath)
+    set_filename(fpath)
+    save()
+    gui_set_window_title(@title, @subtitle) #TODO: if not active buffer?
   end
 
   def write_contents_to_file(fpath)
@@ -1720,14 +1778,13 @@ class Buffer < String
   def backup()
     fname = @fname
     return if !@fname
-    message("Backup buffer #{fname}")
     spfx = fname.gsub("=", "==").gsub("/", "=:")
-    spath = File.expand_path("~/autosave")
+    spath = File.expand_path("~/.vimamsa/backup")
     return false if !can_save_to_directory?(spath)
     datetime = DateTime.now().strftime("%d%m%Y:%H%M%S")
     savepath = "#{spath}/#{spfx}_#{datetime}"
+    message("Backup buffer #{fname} TO: #{savepath}")
     if is_path_writable(savepath)
-      debug "BACKUP BUFFER TO: #{savepath}"
       write_contents_to_file(savepath)
     else
       message("PATH NOT WRITABLE: #{savepath}")

data/lib/vimamsa/buffer_list.rb

@@ -23,6 +23,7 @@ end
 class BufferList < Array
   attr_reader :current_buf
 
+
   def <<(_buf)
     super
     $buffer = _buf
@@ -30,8 +31,8 @@ class BufferList < Array
     $buffer_history << @current_buf
     @recent_ind = 0
     $hook.call(:change_buffer, $buffer)
-    qt_set_current_buffer($buffer.id)
-    qt_set_cursor_pos($buffer.id, $buffer.pos)
+    gui_set_current_buffer($buffer.id)
+    gui_set_cursor_pos($buffer.id, $buffer.pos)
   end
 
   def switch()
@@ -57,6 +58,12 @@ class BufferList < Array
     buf_idx = self.index { |b| b.fname == fname }
     return buf_idx
   end
+  
+   def get_buffer_by_id(id)
+    buf_idx = self.index { |b| b.id == id }
+    return buf_idx
+  end
+ 
 
   def add_current_buf_to_history()
     @recent_ind = 0
@@ -83,7 +90,7 @@ class BufferList < Array
     $hook.call(:change_buffer, $buffer)
     $buffer.set_active
 
-    qt_set_current_buffer($buffer.id)
+    gui_set_current_buffer($buffer.id)
     gui_set_window_title($buffer.title,$buffer.subtitle)   
 
     # hpt_scan_images() if $debug # experimental
@@ -138,7 +145,24 @@ class BufferList < Array
     $buffer_history = bh.reverse
   end
 
+
+  # Close buffer in the background
+  # TODO: if open in another widget
+  def close_other_buffer(buffer_i)
+    return if self.size <= buffer_i
+    return if @current_buf == buffer_i
+    
+    bufname = self[buffer_i].basename
+    message("Closed buffer #{bufname}")
+
+    self.slice!(buffer_i)
+    $buffer_history = $buffer_history.collect { |x| r = x; r = x - 1 if x > buffer_i; r = nil if x == buffer_i; r }.compact
+
+  end
+
+
   def close_buffer(buffer_i, from_recent = false)
+    return if buffer_i.nil?
     return if self.size <= buffer_i
     
     bufname = self[buffer_i].basename