Merge branch 'master' into utf-8-single-width

Conflicts:
	lib/diakonos/version.rb

diakonos.conf

@@ -347,7 +347,7 @@ key ctrl+o   open_file_ask
 key alt+o    open_matching_files
 key ctrl+s   save_file
 key esc S    save_file_as
-key ctrl+w      close_file
+key ctrl+w      close_buffer
 key ctrl+alt+o  revert
 key alt+!       setReadOnly
 key ctrl+q      quit

lib/diakonos.rb

@@ -125,7 +125,7 @@ class Diakonos
 
     attr_reader :diakonos_home, :script_dir, :clipboard,
       :list_filename, :hooks, :indenters, :indenters_next_line, :unindenters, :closers,
-      :functions_last, :there_was_non_movement, :do_display, :testing
+      :functions_last, :there_was_non_movement, :do_display, :testing, :buffers
 
     include ::Diakonos::Functions
 
@@ -344,7 +344,7 @@ def start
 
       if session_buffers
         session_buffers.each do |buffer|
-          close_file buffer
+          close_buffer buffer
         end
       end
 

lib/diakonos/buffer-management.rb

@@ -47,7 +47,7 @@ def show_buffer_file_diff( buffer = @buffer_current )
       `#{@settings[ 'diff_command' ]} #{current_text_file} #{buffer.name} > #{@diff_filename}`
       diff_buffer = open_file( @diff_filename )
       yield diff_buffer
-      close_file diff_buffer
+      close_buffer diff_buffer
     end
 
   end

lib/diakonos/functions-deprecated.rb

@@ -10,7 +10,8 @@ module Functions
     alias_method :carriageReturn,         :carriage_return
     alias_method :changeSessionSetting,   :change_session_setting
     alias_method :clearMatches,           :clear_matches
-    alias_method :closeFile,              :close_file
+    alias_method :closeFile,              :close_buffer
+    alias_method :close_file,             :close_buffer
     alias_method :collapseWhitespace,     :collapse_whitespace
     alias_method :copySelection,          :copy_selection
     alias_method :cursorDown,             :cursor_down

lib/diakonos/functions.rb

@@ -170,7 +170,7 @@ def help( prefill = '' )
             # TODO: let them choose "never" and "always"
           end
 
-          close_file error_file
+          close_buffer error_file
         else
           help selected
         end
@@ -248,7 +248,7 @@ def quit
       @buffers.each do |buffer|
         next  if ! buffer.modified?
         switch_to buffer
-        closure_choice = close_file( buffer, to_all )
+        closure_choice = close_buffer( buffer, to_all )
         case closure_choice
         when CHOICE_CANCEL
           @quitting = false
@@ -283,7 +283,7 @@ def toggle_macro_recording( name = nil )
     # Undoes the latest change made to the current buffer,
     # or reopens the file that was just closed.
     def undo( buffer = buffer_current )
-      if @functions_last[-1] == 'close_file'
+      if @functions_last[-1] == 'close_buffer'
         open_file(
           @buffer_closed.name,
           'cursor' => {

lib/diakonos/functions/buffers.rb

@@ -10,7 +10,7 @@ module Functions
     # @return [Fixnum] the choice the user made, or nil if the user was not prompted to choose.
     # @see Diakonos::CHOICE_YES
     # @see Diakonos::CHOICE_NO
-    def close_file( buffer = buffer_current, to_all = nil )
+    def close_buffer( buffer = buffer_current, to_all = nil )
       return nil  if buffer.nil?
 
       choice = nil

lib/diakonos/functions/sessions.rb

@@ -51,7 +51,7 @@ def load_session( session_id = nil )
         end
         @session = nil
         @buffers.each do |buffer|
-          close_file buffer
+          close_buffer buffer
         end
         new_session( path )
         @session[ 'files' ].each do |file|

lib/diakonos/help.rb

@@ -9,7 +9,7 @@ def open_help_buffer
       @help_buffer = open_file( @help_filename )
     end
     def close_help_buffer
-      close_file @help_buffer
+      close_buffer @help_buffer
       @help_buffer = nil
     end
 

lib/diakonos/list.rb

@@ -8,7 +8,7 @@ def open_list_buffer
     end
 
     def close_list_buffer
-      close_file @list_buffer
+      close_buffer @list_buffer
       @list_buffer = nil
     end
 

lib/diakonos/version.rb

@@ -1,6 +1,6 @@
 module Diakonos
   VERSION       = '0.9.0'
-  LAST_MODIFIED = 'July 27, 2011'
+  LAST_MODIFIED = 'July 31, 2011'
 
   def self.parse_version( s )
     if s

spec/functions/basics.rb

@@ -9,7 +9,7 @@
   end
 
   after do
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
   end
 
   it 'delete the current character' do

spec/functions/buffer.rb

@@ -9,30 +9,43 @@
   end
 
   after do
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
+  end
+
+  it 'can close a buffer' do
+    name = @d.buffer_current.name
+    n = @d.buffers.size
+    n.should > 0
+    @d.buffers.map(&:name).should.include name
+
+    @d.close_buffer
+
+    @d.buffers.size.should.equal n-1
+    @d.buffer_current.name.should.not.equal name
+    @d.buffers.map(&:name).should.not.include name
   end
 
   it 'open a file at a specific line number' do
     @b = @d.open_file( "#{SAMPLE_FILE_LONGER}:45" )
     cursor_should_be_at 44, 0
 
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
     @b = @d.open_file( "#{SAMPLE_FILE_LONGER}:50:" )
     cursor_should_be_at 49, 0
 
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
     @b = @d.open_file( "#{SAMPLE_FILE_LONGER}:54: in `block in methodname'" )
     cursor_should_be_at 53, 0
 
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
     @b = @d.open_file( "        from #{SAMPLE_FILE_LONGER}:57: in `block in methodname'" )
     cursor_should_be_at 56, 0
 
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
     @b = @d.open_file( %{  File "#{SAMPLE_FILE_LONGER}", line 55, in decoration} )
     cursor_should_be_at 54, 0
 
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
     @b = @d.open_file( " at #{SAMPLE_FILE_LONGER} line 61" )
     cursor_should_be_at 60, 0
 

spec/functions/clipboard.rb

@@ -9,7 +9,7 @@
   end
 
   after do
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
   end
 
   it 'copy selected text' do

spec/functions/cursor.rb

@@ -8,7 +8,7 @@
   end
 
   after do
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
   end
 
   it 'move the cursor in the four basic directions' do

spec/functions/selection.rb

@@ -9,7 +9,7 @@
   end
 
   after do
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
   end
 
   it 'select text' do

spec/functions/text-manipulation.rb

@@ -9,7 +9,7 @@
   end
 
   after do
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
   end
 
   it 'collapse whitespace' do

spec/searching.rb

@@ -9,7 +9,7 @@
   end
 
   after do
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
   end
 
   it 'can grep the open buffers' do
@@ -46,7 +46,7 @@
   end
 
   after do
-    @d.close_file @b, Diakonos::CHOICE_NO_TO_ALL
+    @d.close_buffer @b, Diakonos::CHOICE_NO_TO_ALL
   end
 
   it 'can find next closest characters' do