diakonos 0.8.6 → 0.8.7

data/lib/diakonos/array.rb

@@ -9,7 +9,7 @@ class Array
                 chain_str << key.to_s + " "
             end
         end
-        return chain_str
+        chain_str
     end
 end
 

data/lib/diakonos/bignum.rb

@@ -1,6 +1,9 @@
 require 'diakonos/keycode'
 
 class Bignum
-    include Diakonos::KeyCode
+  include Diakonos::KeyCode
+  def ord
+    self
+  end
 end
 

data/lib/diakonos/bookmark.rb

@@ -11,25 +11,24 @@ class Bookmark
     end
 
     def == (other)
-        return false if other == nil
-        return ( @buffer == other.buffer and @row == other.row and @col == other.col )
+        return false if other.nil?
+        ( @buffer == other.buffer and @row == other.row and @col == other.col )
     end
 
     def <=> (other)
-        return nil if other == nil
+        return nil if other.nil?
         comparison = ( $diakonos.bufferToNumber( @buffer ) <=> $diakonos.bufferToNumber( other.buffer ) )
         return comparison if comparison != 0
         comparison = ( @row <=> other.row )
         return comparison if comparison != 0
-        comparison = ( @col <=> other.col )
-        return comparison
+        @col <=> other.col
     end
 
     def < (other)
-        return ( ( self <=> other ) < 0 )
+        ( ( self <=> other ) < 0 )
     end
     def > (other)
-        return ( ( self <=> other ) > 0 )
+        ( ( self <=> other ) > 0 )
     end
     
     def incRow( increment )
@@ -44,7 +43,7 @@ class Bookmark
     end
 
     def to_s
-        return "[#{@name}|#{@buffer.name}:#{@row+1},#{@col+1}]"
+        "[#{@name}|#{@buffer.name}:#{@row+1},#{@col+1}]"
     end
 end
 

data/lib/diakonos/buffer-hash.rb

@@ -1,18 +1,60 @@
+# A Hash which is iterated in insertion order.
+# Keys are assumed to be paths; these paths are expanded on read and write.
 class BufferHash < Hash
-    def [] ( key )
-        case key
-            when String
-                key = File.expand_path( key )
-        end
-        return super
+  def initialize
+    @keys_ = []
+  end
+  
+  def [] ( key )
+    super File.expand_path( key.to_s )
+  end
+  
+  def []= ( key, value )
+    key = File.expand_path( key.to_s )
+    if not @keys_.include?( key )
+      @keys_ << key
     end
-    
-    def []= ( key, value )
-        case key
-            when String
-                key = File.expand_path( key )
-        end
-        super
+    super key, value
+  end
+  
+  def each
+    @keys_.each do |key|
+      yield key, self[ key ]
     end
+  end
+  
+  def each_key
+    @keys_.each do |key|
+      yield key
+    end
+  end
+  
+  def each_value
+    @keys_.each do |key|
+      yield self[ key ]
+    end
+  end
+  
+  def clear
+    @keys_ = []
+    super
+  end
+  
+  def delete( key )
+    @keys_.delete key
+    super
+  end
+  
+  def keys
+    @keys_.dup
+  end
+  
+  def values
+    @keys_.map { |key| self[ key ] }
+  end
+  
+  def length
+    @keys_.length
+  end
 end
 

data/lib/diakonos/buffer-management.rb

@@ -0,0 +1,73 @@
+module Diakonos
+  class Diakonos
+    attr_reader :current_buffer
+    
+    def switchTo( buffer )
+      switched = false
+      if buffer
+        @buffer_stack -= [ @current_buffer ]
+        if @current_buffer
+          @buffer_stack.push @current_buffer
+        end
+        @current_buffer = buffer
+        runHookProcs( :after_buffer_switch, buffer )
+        updateStatusLine
+        updateContextLine
+        buffer.display
+        switched = true
+      end
+      
+      switched
+    end
+    protected :switchTo
+    
+    def remember_buffer( buffer )
+      if @buffer_history.last != buffer
+        @buffer_history << buffer
+        @buffer_history_pointer = @buffer_history.size - 1
+      end
+    end
+    
+    # The given buffer_number should be 1-based, not zero-based.
+    # Returns nil if no such buffer exists.
+    def bufferNumberToName( buffer_number )
+      return nil if buffer_number < 1
+      
+      number = 1
+      buffer_name = nil
+      @buffers.each_key do |name|
+        if number == buffer_number
+          buffer_name = name
+          break
+        end
+        number += 1
+      end
+      buffer_name
+    end
+
+    # The returned value is 1-based, not zero-based.
+    # Returns nil if no such buffer exists.
+    def bufferToNumber( buffer )
+      number = 1
+      buffer_number = nil
+      @buffers.each_value do |b|
+        if b == buffer
+          buffer_number = number
+          break
+        end
+        number += 1
+      end
+      buffer_number
+    end
+
+    def show_buffer_file_diff( buffer = @current_buffer )
+      current_text_file = @diakonos_home + '/current-buffer'
+      buffer.saveCopy( current_text_file )
+      `#{@settings[ 'diff_command' ]} #{current_text_file} #{buffer.name} > #{@diff_filename}`
+      diff_buffer = openFile( @diff_filename )
+      yield diff_buffer
+      closeFile diff_buffer
+    end
+    
+  end
+end

data/lib/diakonos/buffer.rb

@@ -1,7 +1,7 @@
 module Diakonos
 
 class Buffer
-    attr_reader :name, :key, :modified, :original_language, :changing_selection, :read_only,
+    attr_reader :name, :key, :original_language, :changing_selection, :read_only,
         :last_col, :last_row, :tab_size, :last_screen_x, :last_screen_y, :last_screen_col
     attr_writer :desired_column, :read_only
 
@@ -38,7 +38,7 @@ class Buffer
 
         @buffer_states = Array.new
         @cursor_states = Array.new
-        if @name != nil
+        if @name
             @name = @name.subHome
             if FileTest.exists? @name
                 @lines = IO.readlines( @name )
@@ -94,7 +94,7 @@ class Buffer
                 @diakonos.setILine "(spaces substituted for tab characters)"
             end
         end
-            
+
         @buffer_states[ @current_buffer_state ] = @lines
         @cursor_states[ @current_buffer_state ] = [ @last_row, @last_col ]
     end
@@ -110,7 +110,7 @@ class Buffer
         setLanguage language
         @original_language = @language
     end
-    
+
     def reset_win_main
         @win_main = @diakonos.win_main
     end
@@ -128,7 +128,7 @@ class Buffer
         @auto_indent = @settings[ "lang.#{@language}.indent.auto" ]
         @indent_size = ( @settings[ "lang.#{@language}.indent.size" ] or 4 )
         @indent_roundup = @settings[ "lang.#{@language}.indent.roundup" ].nil? ? true : @settings[ "lang.#{@language}.indent.roundup" ]
-        @indent_closers = @settings[ "lang.#{@language}.indent.closers" ].nil? ? true : @settings[ "lang.#{@language}.indent.closers" ]
+        @indent_closers = @settings[ "lang.#{@language}.indent.closers" ].nil? ? false : @settings[ "lang.#{@language}.indent.closers" ]
         @default_formatting = ( @settings[ "lang.#{@language}.format.default" ] or Curses::A_NORMAL )
         @selection_formatting = ( @settings[ "lang.#{@language}.format.selection" ] or Curses::A_REVERSE )
         @indent_ignore_charset = ( @settings[ "lang.#{@language}.indent.ignore.charset" ] or "" )
@@ -137,41 +137,45 @@ class Buffer
     protected :setLanguage
 
     def [] ( arg )
-        return @lines[ arg ]
+        @lines[ arg ]
     end
-    
+
     def == (other)
         return false if other.nil?
         key == other.key
     end
 
     def length
-        return @lines.length
+        @lines.length
+    end
+
+    def modified?
+      @modified
     end
 
     def nice_name
-        return ( @name || @settings[ "status.unnamed_str" ] )
+        @name || @settings[ "status.unnamed_str" ]
     end
 
     def display
         return if not @diakonos.do_display
-        
+
         Thread.new do
             #if $profiling
                 #RubyProf.start
             #end
-                    
+
             if @diakonos.display_mutex.try_lock
                 begin
                     Curses::curs_set 0
-                    
+
                     @continued_format_class = nil
-                    
+
                     @pen_down = true
-                    
+
                     # First, we have to "draw" off-screen, in order to check for opening of
                     # multi-line highlights.
-                    
+
                     # So, first look backwards from the @top_line to find the first opening
                     # regexp match, if any.
                     index = @top_line - 1
@@ -179,22 +183,22 @@ class Buffer
                         open_index = -1
                         open_token_class = nil
                         open_match_text = nil
-                        
+
                         open_index, open_token_class, open_match_text = findOpeningMatch( line )
-                        
-                        if open_token_class != nil
+
+                        if open_token_class
                             @pen_down = false
                             @lines[ index...@top_line ].each do |line|
                                 printLine line
                             end
                             @pen_down = true
-                            
+
                             break
                         end
-                        
+
                         index = index - 1
                     end
-                    
+
                     # Draw each on-screen line.
                     y = 0
                     @lines[ @top_line...(@diakonos.main_window_height + @top_line) ].each_with_index do |line, row|
@@ -204,7 +208,7 @@ class Buffer
                         paintMarks @top_line + row
                         y += 1
                     end
-                    
+
                     # Paint the empty space below the file if the file is too short to fit in one screen.
                     ( y...@diakonos.main_window_height ).each do |y|
                         @win_main.setpos( y, 0 )
@@ -213,17 +217,17 @@ class Buffer
                         if @settings[ "view.nonfilelines.visible" ]
                             linestr[ 0 ] = ( @settings[ "view.nonfilelines.character" ] or "~" )
                         end
-                        
+
                         @win_main.addstr linestr
                     end
-                    
+
                     @win_main.setpos( @last_screen_y , @last_screen_x )
                     @win_main.refresh
-                    
+
                     if @language != @original_language
                         setLanguage( @original_language )
                     end
-                    
+
                     Curses::curs_set 1
                 rescue Exception => e
                     @diakonos.log( "Display Exception:" )
@@ -236,7 +240,7 @@ class Buffer
             else
                 @diakonos.displayEnqueue( self )
             end
-            
+
             #if $profiling
                 #result = RubyProf.stop
                 #printer = RubyProf::GraphHtmlPrinter.new( result )
@@ -245,7 +249,7 @@ class Buffer
                 #end
             #end
         end
-        
+
     end
 
     def findOpeningMatch( line, match_close = true, bos_allowed = true )
@@ -266,7 +270,7 @@ class Buffer
                 end
                 if ( not regexp.uses_bos ) or ( bos_allowed and ( whole_match_index == 0 ) )
                     if index < open_index
-                        if ( ( not match_close ) or @close_token_regexps[ token_class ] != nil )
+                        if ( ( not match_close ) or @close_token_regexps[ token_class ] )
                             open_index = index
                             open_token_class = token_class
                             open_match_text = match_text
@@ -276,7 +280,7 @@ class Buffer
             end
         end
 
-        return [ open_index, open_token_class, open_match_text ]
+        [ open_index, open_token_class, open_match_text ]
     end
 
     def findClosingMatch( line_, regexp, bos_allowed = true, start_at = 0 )
@@ -303,14 +307,14 @@ class Buffer
             end
         end
 
-        return [ close_index, close_match_text ]
+        [ close_index, close_match_text ]
     end
     protected :findClosingMatch
 
     # @mark_start[ "col" ] is inclusive,
     # @mark_end[ "col" ] is exclusive.
     def recordMarkStartAndEnd
-        if @mark_anchor != nil
+        if @mark_anchor
             crow = @last_row
             ccol = @last_col
             anchor_first = true
@@ -344,14 +348,14 @@ class Buffer
             @text_marks[ SELECTION ] = nil
         end
     end
-    
+
     def selection_mark
       @text_marks[ SELECTION ]
     end
     def selecting?
       !!selection_mark
     end
-    
+
     def select_current_line
       @text_marks[ SELECTION ] = TextMark.new(
         @last_row,
@@ -362,15 +366,15 @@ class Buffer
       )
       @lines[ @last_row ]
     end
-    
+
     def select_all
       anchorSelection( 0, 0, DONT_DISPLAY )
       cursorTo( @lines.length - 1, @lines[ -1 ].length, DO_DISPLAY )
     end
-    
+
     def select( from_regexp, to_regexp, include_ending = true )
       start_row = nil
-      
+
       @lines[ 0..@last_row ].reverse.each_with_index do |line,index|
         if line =~ from_regexp
           start_row = @last_row - index
@@ -401,14 +405,14 @@ class Buffer
     # write_cursor_col is buffer-relative, not screen-relative
     def truncateOffScreen( string, write_cursor_col )
         retval = string
-        
+
         # Truncate based on left edge of display area
         if write_cursor_col < @left_column
             retval = retval[ (@left_column - write_cursor_col)..-1 ]
             write_cursor_col = @left_column
         end
 
-        if retval != nil
+        if retval
             # Truncate based on right edge of display area
             if write_cursor_col + retval.length > @left_column + Curses::cols - 1
                 new_length = ( @left_column + Curses::cols - write_cursor_col )
@@ -419,28 +423,28 @@ class Buffer
                 end
             end
         end
-        
-        return ( retval == "" ? nil : retval )
+
+        retval == "" ? nil : retval
     end
-    
+
     # For debugging purposes
     def quotedOrNil( str )
-        if str == nil
-            return "nil"
+        if str.nil?
+            "nil"
         else
-            return "'#{str}'"
+            "'#{str}'"
         end
     end
-    
+
     def paintMarks( row )
         string = @lines[ row ][ @left_column ... @left_column + Curses::cols ]
-        return if string == nil or string == ""
+        return if string.nil? or string == ""
         string = string.expandTabs( @tab_size )
         cury = @win_main.cury
         curx = @win_main.curx
-        
+
         @text_marks.reverse_each do |text_mark|
-            if text_mark != nil
+            if text_mark
                 @win_main.attrset text_mark.formatting
                 if ( (text_mark.start_row + 1) .. (text_mark.end_row - 1) ) === row
                     @win_main.setpos( cury, curx )
@@ -475,7 +479,7 @@ class Buffer
 
     def printString( string, formatting = ( @token_formats[ @continued_format_class ] or @default_formatting ) )
         return if not @pen_down
-        return if string == nil
+        return if string.nil?
 
         @win_main.attrset formatting
         @win_main.addstr string
@@ -491,10 +495,10 @@ class Buffer
         index = nil
         while i < line.length
             substr = line[ i..-1 ]
-            if @continued_format_class != nil
+            if @continued_format_class
                 close_index, close_match_text = findClosingMatch( substr, @close_token_regexps[ @continued_format_class ], i == 0 )
 
-                if close_match_text == nil
+                if close_match_text.nil?
                     printString truncateOffScreen( substr, i )
                     printPaddingFrom( line.length )
                     i = line.length
@@ -510,7 +514,7 @@ class Buffer
                 if @lang_stack.length > 0
                     prev_lang, close_token_class = @lang_stack[ -1 ]
                     close_index, close_match_text = findClosingMatch( substr, @diakonos.close_token_regexps[ prev_lang ][ close_token_class ], i == 0 )
-                    if close_match_text != nil and close_index <= first_index
+                    if close_match_text and close_index <= first_index
                         if close_index > 0
                             # Print any remaining text in the embedded language
                             printString truncateOffScreen( substr[ 0...close_index ], i )
@@ -531,7 +535,7 @@ class Buffer
                     end
                 end
 
-                if first_word != nil
+                if first_word
                     if first_index > 0
                         # Print any preceding text in the default format
                         printString truncateOffScreen( substr[ 0...first_index ], i )
@@ -539,7 +543,7 @@ class Buffer
                     end
                     printString( truncateOffScreen( first_word, i ), @token_formats[ first_token_class ] )
                     i += first_word.length
-                    if @close_token_regexps[ first_token_class ] != nil
+                    if @close_token_regexps[ first_token_class ]
                         if change_to = @settings[ "lang.#{@language}.tokens.#{first_token_class}.change_to" ]
                             @lang_stack.push [ @language, first_token_class ]
                             setLanguage change_to
@@ -566,84 +570,98 @@ class Buffer
         else
             remainder = @left_column + Curses::cols - col
         end
-        
+
         if remainder > 0
             printString( " " * remainder )
         end
     end
 
     def save( filename = nil, prompt_overwrite = DONT_PROMPT_OVERWRITE )
-        if filename != nil
-            name = filename.subHome
-        else
-            name = @name
-        end
-        
-        if @read_only and FileTest.exists?( @name ) and FileTest.exists?( name ) and ( File.stat( @name ).ino == File.stat( name ).ino )
-            @diakonos.setILine "#{name} cannot be saved since it is read-only."
+      if filename
+        name = filename.subHome
+      else
+        name = @name
+      end
+
+      if @read_only and FileTest.exists?( @name ) and FileTest.exists?( name ) and ( File.stat( @name ).ino == File.stat( name ).ino )
+        @diakonos.setILine "#{name} cannot be saved since it is read-only."
+      else
+        @read_only = false
+        if name.nil?
+          @diakonos.saveFileAs
         else
-            @name = name
-            @read_only = false
-            if @name == nil
-                @diakonos.saveFileAs
-            #elsif name.empty?
-                #@diakonos.setILine "(file not saved)"
-                #@name = nil
-            else
-                proceed = true
-                
-                if prompt_overwrite and FileTest.exists? @name
-                    proceed = false
-                    choice = @diakonos.getChoice(
-                        "Overwrite existing '#{@name}'?",
-                        [ CHOICE_YES, CHOICE_NO ],
-                        CHOICE_NO
-                    )
-                    case choice
-                        when CHOICE_YES
-                            proceed = true
-                        when CHOICE_NO
-                            proceed = false
-                    end
-                end
-                
-                if file_modified
-                    proceed = ! @diakonos.revert( "File has been altered externally.  Load on-disk version?" )
+          proceed = true
+
+          if prompt_overwrite and FileTest.exists? name
+            proceed = false
+            choice = @diakonos.getChoice(
+              "Overwrite existing '#{name}'?",
+              [ CHOICE_YES, CHOICE_NO ],
+              CHOICE_NO
+            )
+            case choice
+            when CHOICE_YES
+              proceed = true
+            when CHOICE_NO
+              proceed = false
+            end
+          end
+
+          if file_modified?
+            proceed = ! @diakonos.revert( "File has been altered externally.  Load on-disk version?" )
+          end
+
+          if proceed
+            File.open( name, "w" ) do |f|
+              @lines[ 0..-2 ].each do |line|
+                if @settings[ 'strip_trailing_whitespace_on_save' ]
+                  line.rstrip!
                 end
-                
-                if proceed
-                    File.open( @name, "w" ) do |f|
-                        @lines[ 0..-2 ].each do |line|
-                            f.puts line
-                        end
-                        if @lines[ -1 ] != ""
-                            # No final newline character
-                            f.print @lines[ -1 ]
-                            f.print "\n" if @settings[ "eof_newline" ]
-                        end
-                    end
-                    @last_modification_check = File.mtime( @name )
-                        
-                    if @name == @diakonos.diakonos_conf
-                        @diakonos.loadConfiguration
-                        @diakonos.initializeDisplay
-                    end
-                    
-                    @modified = false
-                    
-                    display
-                    @diakonos.updateStatusLine
+                f.puts line
+              end
+
+              line = @lines[ -1 ]
+              if @settings[ 'strip_trailing_whitespace_on_save' ]
+                line.rstrip!
+              end
+              if line != ""
+                # No final newline character
+                f.print line
+                f.print "\n" if @settings[ "eof_newline" ]
+              end
+
+              if @settings[ 'strip_trailing_whitespace_on_save' ]
+                if @last_col > @lines[ @last_row ].size
+                  cursorTo @last_row, @lines[ @last_row ].size
                 end
+              end
+            end
+            @name = name
+            @last_modification_check = File.mtime( @name )
+            saved = true
+
+            if @name == @diakonos.diakonos_conf
+              @diakonos.loadConfiguration
+              @diakonos.initializeDisplay
             end
+
+            @modified = false
+
+            display
+            @diakonos.updateStatusLine
+          end
         end
+      end
+
+      saved
     end
 
     # Returns true on successful write.
     def saveCopy( filename )
         return false if filename.nil?
-        
+
         name = filename.subHome
-        
+
         File.open( name, "w" ) do |f|
             @lines[ 0..-2 ].each do |line|
                 f.puts line
@@ -654,8 +672,8 @@ class Buffer
                 f.print "\n" if @settings[ "eof_newline" ]
             end
         end
-        
-        return true
+
+        true
     end
 
     def replaceChar( c )
@@ -674,7 +692,7 @@ class Buffer
         @lines[ row ] = line[ 0...col ] + c.chr + line[ col..-1 ]
         setModified
     end
-    
+
     def insertString( str )
         row = @last_row
         col = @last_col
@@ -686,7 +704,7 @@ class Buffer
 
     # x and y are given window-relative, not buffer-relative.
     def delete
-        if selection_mark != nil
+        if selection_mark
             deleteSelection
         else
             row = @last_row
@@ -707,7 +725,7 @@ class Buffer
             end
         end
     end
-    
+
     def joinLines( row = @last_row, strip = DONT_STRIP_LINE )
         takeSnapshot( TYPING )
         next_line = @lines.delete_at( row + 1 )
@@ -717,7 +735,7 @@ class Buffer
         @lines[ row ] << next_line
         setModified
     end
-    
+
     def close_code
       line = @lines[ @last_row ]
       @closers.each_value do |h|
@@ -736,12 +754,12 @@ class Buffer
         end
       end
     end
-    
+
     def collapseWhitespace
       if selection_mark
         removeSelection DONT_DISPLAY
       end
-        
+
       line = @lines[ @last_row ]
       head = line[ 0...@last_col ]
       tail = line[ @last_col..-1 ]
@@ -754,7 +772,7 @@ class Buffer
         setModified
       end
     end
-    
+
     def selected_lines
       selection = selection_mark
       if selection
@@ -768,10 +786,10 @@ class Buffer
         [ @lines[ @last_row ] ]
       end
     end
-    
+
     def columnize( delimiter = /=>?|:|,/, num_spaces_padding = 1 )
       takeSnapshot
-      
+
       lines = selected_lines
       column_width = 0
       lines.each do |line|
@@ -780,10 +798,10 @@ class Buffer
           column_width = [ pos, column_width ].max
         end
       end
-      
+
       padding = ' ' * num_spaces_padding
       one_modified = false
-      
+
       lines.each do |line|
         old_line = line.dup
         if line =~ /^(.+?)(#{delimiter.source})(.*)$/
@@ -802,12 +820,12 @@ class Buffer
         end
         one_modified ||= ( line != old_line )
       end
-      
+
       if one_modified
         setModified
       end
     end
-    
+
     def comment_out
       takeSnapshot
       one_modified = false
@@ -821,7 +839,7 @@ class Buffer
         setModified
       end
     end
-    
+
     def uncomment
       takeSnapshot
       comment_string = Regexp.escape( @settings[ "lang.#{@language}.comment_string" ].to_s )
@@ -839,7 +857,7 @@ class Buffer
     end
 
     def deleteLine
-        removeSelection( DONT_DISPLAY ) if selection_mark != nil
+        removeSelection( DONT_DISPLAY ) if selection_mark
 
         row = @last_row
         takeSnapshot
@@ -858,17 +876,17 @@ class Buffer
     end
 
     def deleteToEOL
-        removeSelection( DONT_DISPLAY ) if selection_mark != nil
+        removeSelection( DONT_DISPLAY ) if selection_mark
 
         row = @last_row
         col = @last_col
-        
+
         takeSnapshot
         if @settings[ 'delete_newline_on_delete_to_eol' ] and col == @lines[ row ].size
           next_line = @lines.delete_at( row + 1 )
           @lines[ row ] << next_line
           retval = ''
-        else        
+        else
           retval = [ @lines[ row ][ col..-1 ] ]
           @lines[ row ] = @lines[ row ][ 0...col ]
         end
@@ -877,6 +895,31 @@ class Buffer
         retval
     end
 
+    def delete_to( char )
+      removeSelection( DONT_DISPLAY )  if selection_mark
+      takeSnapshot
+      index = @lines[ @last_row ].index( char, @last_col )
+      if index
+        retval = @lines[ @last_row ].slice!( @last_col, index - @last_col )
+        setModified
+        retval
+      end
+    end
+
+    def delete_to_and_from( char )
+      removeSelection( DONT_DISPLAY )  if selection_mark
+      takeSnapshot
+      index_before = @lines[ @last_row ].rindex( char, @last_col )
+      index_after = @lines[ @last_row ].index( char, @last_col )
+      if index_before && index_after
+        index_before += 1
+        retval = @lines[ @last_row ].slice!( index_before, index_after - index_before )
+        cursorTo( @last_row, index_before )
+        setModified
+        retval
+      end
+    end
+
     def carriageReturn
         takeSnapshot
         row = @last_row
@@ -898,40 +941,40 @@ class Buffer
             @lines[ row ]
         end
     end
-    
+
     def current_line
       @lines[ @last_row ]
     end
 
     # Returns true iff the given column, x, is less than the length of the given line, y.
     def inLine( x, y )
-        return ( x + @left_column < lineAt( y ).length )
+        x + @left_column < lineAt( y ).length
     end
 
     # Translates the window column, x, to a buffer-relative column index.
     def columnOf( x )
-        return @left_column + x
+        @left_column + x
     end
 
     # Translates the window row, y, to a buffer-relative row index.
     def rowOf( y )
-        return @top_line + y
+        @top_line + y
     end
-    
+
     # Returns nil if the row is off-screen.
     def rowToY( row )
-        return nil if row == nil
+        return nil if row.nil?
         y = row - @top_line
         y = nil if ( y < 0 ) or ( y > @top_line + @diakonos.main_window_height - 1 )
-        return y
+        y
     end
-    
+
     # Returns nil if the column is off-screen.
     def columnToX( col )
-        return nil if col == nil
+        return nil if col.nil?
         x = col - @left_column
         x = nil if ( x < 0 ) or ( x > @left_column + Curses::cols - 1 )
-        return x
+        x
     end
 
     def currentRow
@@ -948,7 +991,7 @@ class Buffer
         @left_column = [ @left_column + x, 0 ].max
         recordMarkStartAndEnd
         display if do_display
-        return ( @left_column - old_left_column )
+        @left_column - old_left_column
     end
 
     # Returns the amount the view was actually pitched.
@@ -963,17 +1006,17 @@ class Buffer
         else
             @top_line = new_top_line
         end
-        
+
         old_row = @last_row
         old_col = @last_col
-        
+
         changed = ( @top_line - old_top_line )
         if changed != 0 and do_pitch_cursor
             @last_row += changed
         end
-        
+
         height = [ @diakonos.main_window_height, @lines.length ].min
-        
+
         @last_row = @last_row.fit( @top_line, @top_line + height - 1 )
         if @last_row - @top_line < @settings[ "view.margin.y" ]
             @last_row = @top_line + @settings[ "view.margin.y" ]
@@ -985,9 +1028,9 @@ class Buffer
         @last_col = @last_col.fit( @left_column, [ @left_column + Curses::cols - 1, @lines[ @last_row ].length ].min )
         @last_screen_y = @last_row - @top_line
         @last_screen_x = tabExpandedColumn( @last_col, @last_row ) - @left_column
-        
+
         recordMarkStartAndEnd
-        
+
         if changed != 0
             highlightMatches
             if @diakonos.there_was_non_movement
@@ -997,9 +1040,9 @@ class Buffer
 
         display if do_display
 
-        return changed
+        changed
     end
-    
+
     def pushCursorState( top_line, row, col, clear_stack_pointer = CLEAR_STACK_POINTER )
         new_state = {
             :top_line => top_line,
@@ -1019,7 +1062,7 @@ class Buffer
     def cursorTo( row, col, do_display = DONT_DISPLAY, stopped_typing = STOPPED_TYPING, adjust_row = ADJUST_ROW )
         old_last_row = @last_row
         old_last_col = @last_col
-        
+
         row = row.fit( 0, @lines.length - 1 )
 
         if col < 0
@@ -1059,7 +1102,7 @@ class Buffer
         view_changed = showCharacter( row, new_col )
         @last_screen_y = row - @top_line
         @last_screen_x = new_col - @left_column
-        
+
         @typing = false if stopped_typing
         @last_row = row
         @last_col = col
@@ -1067,13 +1110,13 @@ class Buffer
         changed = ( @last_row != old_last_row or @last_col != old_last_col )
         if changed
             recordMarkStartAndEnd
-            
+
             removed = false
-            if not @changing_selection and selection_mark != nil
+            if not @changing_selection and selection_mark
                 removeSelection( DONT_DISPLAY )
                 removed = true
             end
-            if removed or ( do_display and ( selection_mark != nil or view_changed ) )
+            if removed or ( do_display and ( selection_mark or view_changed ) )
                 display
             else
                 @diakonos.display_mutex.synchronize do
@@ -1082,11 +1125,13 @@ class Buffer
             end
             @diakonos.updateStatusLine
             @diakonos.updateContextLine
+
+            @diakonos.remember_buffer self
         end
-        
-        return changed
+
+        changed
     end
-    
+
     def cursorReturn( direction )
         delta = 0
         if @cursor_stack_pointer.nil?
@@ -1100,25 +1145,25 @@ class Buffer
             else
                 @cursor_stack_pointer = ( @cursor_stack_pointer || @cursor_stack.length ) - 1 - delta
         end
-        
+
         return_pointer = @cursor_stack_pointer
-        
+
         if @cursor_stack_pointer < 0
             return_pointer = @cursor_stack_pointer = 0
         elsif @cursor_stack_pointer >= @cursor_stack.length
             return_pointer = @cursor_stack_pointer = @cursor_stack.length - 1
         else
             cursor_state = @cursor_stack[ @cursor_stack_pointer ]
-            if cursor_state != nil
+            if cursor_state
                 pitchView( cursor_state[ :top_line ] - @top_line, DONT_PITCH_CURSOR, DO_DISPLAY )
                 cursorTo( cursor_state[ :row ], cursor_state[ :col ] )
                 @diakonos.updateStatusLine
             end
         end
-        
-        return return_pointer, @cursor_stack.size
+
+        [ return_pointer, @cursor_stack.size ]
     end
-    
+
     def tabExpandedColumn( col, row )
         delta = 0
         line = @lines[ row ]
@@ -1127,7 +1172,7 @@ class Buffer
                 delta += ( @tab_size - ( (i+delta) % @tab_size ) ) - 1
             end
         end
-        return ( col + delta )
+        col + delta
     end
 
     def cursorToEOF
@@ -1158,7 +1203,7 @@ class Buffer
         end
         cursorTo( row, col, DO_DISPLAY )
     end
-    
+
     def cursorToEOL
       y = @win_main.cury
       end_col = lineAt( y ).length
@@ -1217,7 +1262,7 @@ class Buffer
             break if( panView( amount, DONT_DISPLAY ) != amount )
         end
 
-        return ( @top_line != old_top_line or @left_column != old_left_column )
+        @top_line != old_top_line or @left_column != old_left_column
     end
 
     def setIndent( row, level, do_display = DO_DISPLAY )
@@ -1263,7 +1308,7 @@ class Buffer
                 level = prev_line.indentation_level( @indent_size, @indent_roundup, @tab_size, @indent_ignore_charset )
 
                 line = @lines[ row ]
-                if @preventers != nil
+                if @preventers
                     prev_line = prev_line.gsub( @preventers, "" )
                     line = line.gsub( @preventers, "" )
                 end
@@ -1313,7 +1358,7 @@ class Buffer
         @last_finding = nil
         display if do_display
     end
-    
+
     def toggleSelection
         if @changing_selection
             removeSelection
@@ -1347,7 +1392,7 @@ class Buffer
     end
 
     def deleteSelection( do_display = DO_DISPLAY )
-        return if @text_marks[ SELECTION ] == nil
+        return if @text_marks[ SELECTION ].nil?
 
         takeSnapshot
 
@@ -1371,8 +1416,8 @@ class Buffer
 
     # text is an array of Strings, or a String with zero or more newlines ("\n")
     def paste( text, do_parsed_indent = false )
-      return if text == nil
-      
+      return if text.nil?
+
       if not text.kind_of? Array
         s = text.to_s
         if s.include?( "\n" )
@@ -1381,11 +1426,11 @@ class Buffer
           text = [ s ]
         end
       end
-      
+
       takeSnapshot
-      
+
       deleteSelection( DONT_DISPLAY )
-      
+
       row = @last_row
       col = @last_col
       line = @lines[ row ]
@@ -1407,7 +1452,7 @@ class Buffer
         end
         cursorTo( new_row, columnOf( text[ -1 ].length ) )
       end
-      
+
       setModified
     end
 
@@ -1418,14 +1463,14 @@ class Buffer
     def find( regexps, options = {} )
         return if regexps.nil?
         regexp = regexps[ 0 ]
-        return if regexp == nil or regexp == //
-        
+        return if regexp.nil? or regexp == //
+
         direction = options[ :direction ]
         replacement = options[ :replacement ]
         auto_choice = options[ :auto_choice ]
         from_row = options[ :starting_row ] || @last_row
         from_col = options[ :starting_col ] || @last_col
-        
+
         if direction == :opposite
             case @last_search_direction
                 when :up
@@ -1436,16 +1481,16 @@ class Buffer
         end
         @last_search_regexps = regexps
         @last_search_direction = direction
-        
+
         finding = nil
         wrapped = false
         match = nil
-        
+
         catch :found do
-        
+
             if direction == :down
                 # Check the current row first.
-                
+
                 if index = @lines[ from_row ].index( regexp, ( @last_finding ? @last_finding.start_col : from_col ) + 1 )
                   match = Regexp.last_match
                   found_text = match[ 0 ]
@@ -1456,9 +1501,9 @@ class Buffer
                     finding = nil
                   end
                 end
-                
+
                 # Check below the cursor.
-                
+
                 ( (from_row + 1)...@lines.length ).each do |i|
                     if index = @lines[ i ].index( regexp )
                       match = Regexp.last_match
@@ -1471,11 +1516,11 @@ class Buffer
                       end
                     end
                 end
-                
+
                 # Wrap around.
-                
+
                 wrapped = true
-                
+
                 ( 0...from_row ).each do |i|
                     if index = @lines[ i ].index( regexp )
                       match = Regexp.last_match
@@ -1488,9 +1533,9 @@ class Buffer
                       end
                     end
                 end
-                
+
                 # And finally, the other side of the current row.
-                
+
                 #if index = @lines[ from_row ].index( regexp, ( @last_finding ? @last_finding.start_col : from_col ) - 1 )
                 if index = @lines[ from_row ].index( regexp )
                     if index <= ( @last_finding ? @last_finding.start_col : from_col )
@@ -1504,10 +1549,10 @@ class Buffer
                       end
                     end
                 end
-                
+
             elsif direction == :up
                 # Check the current row first.
-                
+
                 col_to_check = ( @last_finding ? @last_finding.end_col : from_col ) - 1
                 if ( col_to_check >= 0 ) and ( index = @lines[ from_row ][ 0...col_to_check ].rindex( regexp ) )
                   match = Regexp.last_match
@@ -1519,9 +1564,9 @@ class Buffer
                     finding = nil
                   end
                 end
-                
+
                 # Check above the cursor.
-                
+
                 (from_row - 1).downto( 0 ) do |i|
                     if index = @lines[ i ].rindex( regexp )
                       match = Regexp.last_match
@@ -1534,11 +1579,11 @@ class Buffer
                       end
                     end
                 end
-                
+
                 # Wrap around.
-                
+
                 wrapped = true
-                
+
                 (@lines.length - 1).downto(from_row + 1) do |i|
                     if index = @lines[ i ].rindex( regexp )
                       match = Regexp.last_match
@@ -1551,9 +1596,9 @@ class Buffer
                       end
                     end
                 end
-                
+
                 # And finally, the other side of the current row.
-                
+
                 search_col = ( @last_finding ? @last_finding.start_col : from_col ) + 1
                 if index = @lines[ from_row ].rindex( regexp )
                     if index > search_col
@@ -1569,12 +1614,12 @@ class Buffer
                 end
             end
         end
-        
+
         if finding
             if wrapped and not options[ :quiet ]
               @diakonos.setILine( "(search wrapped around BOF/EOF)" )
             end
-            
+
             removeSelection( DONT_DISPLAY )
             @last_finding = finding
             if @settings[ "found_cursor_start" ]
@@ -1586,7 +1631,7 @@ class Buffer
             end
 
             @changing_selection = false
-            
+
             if regexps.length == 1
                 @highlight_regexp = regexp
                 highlightMatches
@@ -1594,7 +1639,7 @@ class Buffer
                 clearMatches
             end
             display
-            
+
             if replacement
               # Substitute placeholders (e.g. \1) in str for the group matches of the last match.
               actual_replacement = replacement.dup
@@ -1606,7 +1651,7 @@ class Buffer
                   match[ ref.to_i ]
                 end
               }
-              
+
               choice = auto_choice || @diakonos.getChoice(
                 "Replace?",
                 [ CHOICE_YES, CHOICE_NO, CHOICE_ALL, CHOICE_CANCEL, CHOICE_YES_AND_STOP ],
@@ -1637,7 +1682,7 @@ class Buffer
     end
 
     def replaceAll( regexp, replacement )
-        return if( regexp == nil or replacement == nil )
+        return if( regexp.nil? or replacement.nil? )
 
         @lines = @lines.collect { |line|
             line.gsub( regexp, replacement )
@@ -1648,15 +1693,14 @@ class Buffer
 
         display
     end
-    
-    def highlightMatches
-        if @highlight_regexp != nil
-            found_marks = @lines[ @top_line...(@top_line + @diakonos.main_window_height) ].grep_indices( @highlight_regexp ).collect do |line_index, start_col, end_col|
-                TextMark.new( @top_line + line_index, start_col, @top_line + line_index, end_col, @settings[ "lang.#{@language}.format.found" ] )
-            end
-            #@text_marks = [ nil ] + found_marks
-            @text_marks = [ @text_marks[ 0 ] ] + found_marks
-        end
+
+    def highlightMatches( regexp = @highlight_regexp )
+      @highlight_regexp = regexp
+      return if @highlight_regexp.nil?
+      found_marks = @lines[ @top_line...(@top_line + @diakonos.main_window_height) ].grep_indices( @highlight_regexp ).collect do |line_index, start_col, end_col|
+        TextMark.new( @top_line + line_index, start_col, @top_line + line_index, end_col, @settings[ "lang.#{@language}.format.found" ] )
+      end
+      @text_marks = [ @text_marks[ 0 ] ] + found_marks
     end
 
     def clearMatches( do_display = DONT_DISPLAY )
@@ -1675,59 +1719,59 @@ class Buffer
           find( @last_search_regexps, :direction => direction )
         end
     end
-    
+
     def seek( regexp, direction = :down )
-        return if regexp == nil or regexp == //
-        
+        return if regexp.nil? or regexp == //
+
         found_row = nil
         found_col = nil
         found_text = nil
         wrapped = false
-        
+
         catch :found do
             if direction == :down
                 # Check the current row first.
-                
+
                 index, match_text = @lines[ @last_row ].group_index( regexp, @last_col + 1 )
-                if index != nil
+                if index
                     found_row = @last_row
                     found_col = index
                     found_text = match_text
                     throw :found
                 end
-                
+
                 # Check below the cursor.
-                
+
                 ( (@last_row + 1)...@lines.length ).each do |i|
                     index, match_text = @lines[ i ].group_index( regexp )
-                    if index != nil
+                    if index
                         found_row = i
                         found_col = index
                         found_text = match_text
                         throw :found
                     end
                 end
-                
+
             else
                 # Check the current row first.
-                
+
                 #col_to_check = ( @last_found_col or @last_col ) - 1
                 col_to_check = @last_col - 1
                 if col_to_check >= 0
                     index, match_text = @lines[ @last_row ].group_rindex( regexp, col_to_check )
-                    if index != nil
+                    if index
                         found_row = @last_row
                         found_col = index
                         found_text = match_text
                         throw :found
                     end
                 end
-                
+
                 # Check above the cursor.
-                
+
                 (@last_row - 1).downto( 0 ) do |i|
                     index, match_text = @lines[ i ].group_rindex( regexp )
-                    if index != nil
+                    if index
                         found_row = i
                         found_col = index
                         found_text = match_text
@@ -1736,15 +1780,27 @@ class Buffer
                 end
             end
         end
-        
-        if found_text != nil
+
+        if found_text
             #@last_found_row = found_row
             #@last_found_col = found_col
             cursorTo( found_row, found_col )
-            
+
             display
         end
-    end    
+    end
+
+    # Returns an Array of results, where each result is a String usually
+    # containing \n's due to context
+    def grep( regexp_source )
+      ::Diakonos.grep_array(
+        Regexp.new( regexp_source ),
+        @lines,
+        @diakonos.settings[ 'grep.context' ],
+        "#{File.basename( @name )}:",
+        @key
+      )
+    end
 
     def setModified( do_display = DO_DISPLAY )
         if @read_only
@@ -1754,14 +1810,14 @@ class Buffer
         fmod = false
         if not @modified
             @modified = true
-            fmod = file_modified
+            fmod = file_modified?
         end
-        
+
         reverted = false
         if fmod
             reverted = @diakonos.revert( "File has been altered externally.  Load on-disk version?" )
         end
-        
+
         if not reverted
             clearMatches
             if do_display
@@ -1770,16 +1826,16 @@ class Buffer
             end
         end
     end
-    
+
     # Check if the file which is being edited has been modified since
     # the last time we checked it; return true if so, false otherwise.
-    def file_modified
+    def file_modified?
         modified = false
-        
-        if @name != nil
+
+        if @name
             begin
                 mtime = File.mtime( @name )
-                
+
                 if mtime > @last_modification_check
                     modified = true
                     @last_modification_check = mtime
@@ -1788,8 +1844,22 @@ class Buffer
                 # Ignore if file doesn't exist
             end
         end
-        
-        return modified
+
+        modified
+    end
+
+    # Compares MD5 sums of buffer and actual file on disk.
+    # Returns true if there is no file on disk.
+    def file_different?
+      if @name
+        Digest::MD5.hexdigest(
+          @lines.join( "\n" )
+        ) != Digest::MD5.hexdigest(
+          File.read( @name )
+        )
+      else
+        true
+      end
     end
 
     def takeSnapshot( typing = false )
@@ -1847,7 +1917,7 @@ class Buffer
         setModified
       end
     end
-    
+
     def wrap_paragraph
       start_row = end_row = @last_row
       until start_row == 0 || @lines[ start_row - 1 ].strip == ''
@@ -1904,7 +1974,7 @@ class Buffer
                 break
             end
         end
-        if prev != nil
+        if prev
             cursorTo( prev.row, prev.col, DO_DISPLAY )
         end
     end
@@ -1945,22 +2015,20 @@ class Buffer
                 end
             end
         end
-        return retval
+        retval
     end
 
     def setType( type )
-        success = false
-        if type != nil
+        if type
             configure( type )
             display
-            success = true
+            true
         end
-        return success
     end
-    
+
     def wordUnderCursor
         word = nil
-        
+
         @lines[ @last_row ].scan( /\w+/ ) do |match_text|
             last_match = Regexp.last_match
             if last_match.begin( 0 ) <= @last_col and @last_col < last_match.end( 0 )
@@ -1968,8 +2036,8 @@ class Buffer
                 break
             end
         end
-        
-        return word
+
+        word
     end
 end