Convert remaining occurrences of current_buffer to buffer_current.

lib/diakonos.rb

@@ -164,7 +164,7 @@ module Diakonos
       @y = 0
 
       @buffer_stack           = Array.new
-      @current_buffer         = nil
+      @buffer_current         = nil
 
       @cursor_stack           = Array.new
       @cursor_stack_pointer   = nil
@@ -300,7 +300,7 @@ module Diakonos
       set_iline "Diakonos #{VERSION} (#{LAST_MODIFIED})   #{help_key} for help  F12 to configure  Ctrl-Q to quit"
 
       session_buffers = session_startup
-      session_buffer_number = @session[ 'current_buffer' ] || 1
+      session_buffer_number = @session[ 'buffer_current' ] || 1
 
       scripts = @extensions.scripts + Dir[ "#{@script_dir}/*" ]
       scripts.each do |script|
@@ -361,7 +361,7 @@ module Diakonos
         if ! @settings[ 'suppress_welcome' ]
           open_file "#{@help_dir}/welcome.dhf"
         else
-          @current_buffer.seek /<<<</
+          @buffer_current.seek /<<<</
         end
 
         begin

lib/diakonos/buffer-management.rb

@@ -1,16 +1,16 @@
 module Diakonos
   class Diakonos
-    attr_reader :current_buffer
+    attr_reader :buffer_current
 
     def switch_to( buffer )
       switched = false
       if buffer
-        @buffer_stack -= [ @current_buffer ]
-        if @current_buffer
-          @buffer_stack.push @current_buffer
+        @buffer_stack -= [ @buffer_current ]
+        if @buffer_current
+          @buffer_stack.push @buffer_current
         end
-        @current_buffer = buffer
-        @session[ 'current_buffer' ] = buffer_to_number( buffer )
+        @buffer_current = buffer
+        @session[ 'buffer_current' ] = buffer_to_number( buffer )
         run_hook_procs( :after_buffer_switch, buffer )
         update_status_line
         update_context_line
@@ -54,7 +54,7 @@ module Diakonos
       buffer_number
     end
 
-    def show_buffer_file_diff( buffer = @current_buffer )
+    def show_buffer_file_diff( buffer = @buffer_current )
       current_text_file = @diakonos_home + '/current-buffer'
       buffer.save_copy( current_text_file )
       `#{@settings[ 'diff_command' ]} #{current_text_file} #{buffer.name} > #{@diff_filename}`

lib/diakonos/functions.rb

@@ -259,12 +259,12 @@ module Diakonos
       end
     end
 
-    # Undoes the latest change made to the current_buffer.
+    # Undoes the latest change made to the current buffer.
     def undo( buffer = buffer_current )
       buffer.undo
     end
 
-    # Redoes the latest change undone on the current_buffer.
+    # Redoes the latest change undone on the current buffer.
     def unundo( buffer = buffer_current )
       buffer.unundo
     end

lib/diakonos/functions/basics.rb

@@ -17,7 +17,7 @@ module Diakonos
       buffer_current.delete_selection
     end
 
-    # Calls Buffer#delete on the current_buffer.
+    # Calls Buffer#delete on the current buffer.
     def delete
       buffer_current.delete
     end

lib/diakonos/sessions.rb

@@ -11,7 +11,7 @@ module Diakonos
         'settings' => Hash.new,
         'name' => name,
         'buffers' => [],
-        'current_buffer' => 1,
+        'buffer_current' => 1,
         'dir' => Dir.getwd,
       }
     end