diakonos 0.8.4 → 0.8.5

data/CHANGELOG

@@ -4,6 +4,21 @@ Diakonos Changelog
 0.8.5
 
 - Added 256 colour support.
+- Added support for opening files with "filepath:linenumber" syntax.
+- Added ability to put %_ in a code closer as the place to position the cursor.
+- Code closers can now contain newlines.
+- Now closer text is parsed-indented by default.
+- Added copy_selection_to_klipper.
+- Added cut_selection_to_klipper.
+- Added paste_from_klipper.
+- Added delete_and_store_line_to_klipper.
+- Added delete_to_EOL_to_klipper.
+- Added delete_line_to_klipper.
+- Added support for regexp match placeholders (\1, \2, etc.) in findAndReplace.
+- Added $k shell command variable for klipper contents.
+- Added eol_behaviour setting.
+- Various minor bug fixes.
+- Changed to MIT licence.
 
 0.8.4
 

data/LICENCE

@@ -0,0 +1,21 @@
+The MIT Licence
+
+Copyright (c) 2004-2008 Pistos
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/diakonos-256-colour.conf

@@ -0,0 +1,93 @@
+colour 32 253 39     # selection;               light grey on light blue
+colour 33 255 69     # comments;                white on blue
+colour 34 45 black   # Ruby symbols;            light blue on black
+colour 35 123 black  # Ruby instance variables; light blue on black
+colour 36 177 54     # regular expressions;     purple on dark purple
+colour 37 111 17     # single-quoted strings;   light blue on dark blue
+colour 38 117 18     # double-quoted strings;   light blue on dark blue
+colour 39 213 90     # shell-quoted strings;    light purple on purple
+colour 40 15 234     # constants;               white on light black
+
+colour 41 15 233     # XML nodes;               white on light black
+colour 42 45 233     # XML attributes;          light blue on black
+colour 43 123 233    # XML namespaces;          light blue on black
+
+# Ruby
+
+lang.ruby.format.default white bold
+lang.ruby.format.selection 32
+lang.ruby.format.found yellow inverse
+lang.ruby.tokens.reserved_words.format white
+lang.ruby.tokens.constants.format 40
+lang.ruby.tokens.non_alphanum.format white
+lang.ruby.tokens.symbols.format 34
+lang.ruby.tokens.instance_variables.format 35
+lang.ruby.tokens.comments.format 33
+lang.ruby.tokens.regular_expressions.format 36
+lang.ruby.tokens.regular_expressions2.format 36
+lang.ruby.tokens.singlequoted_strings.format 37
+lang.ruby.tokens.doublequoted_strings.format 38
+lang.ruby.tokens.interpolated_string.format 38
+lang.interpolated_ruby.format.default 38
+lang.interpolated_ruby.tokens.interpolation.format 12 bold
+lang.ruby.tokens.backquoted_strings.format 39
+lang.ruby.tokens.interpolated_exec_string.format 39
+lang.interpolated_exec_ruby.format.default 39
+lang.interpolated_exec_ruby.tokens.interpolation.format 9 bold
+lang.ruby.tokens.character_codes.format magenta bold
+lang.ruby.tokens.long_comments.format 8 bold
+lang.ruby.tokens.sql_string.format 1
+
+# Perl
+
+lang.perl.format.default white bold
+lang.perl.format.selection 32
+lang.perl.format.found yellow inverse
+lang.perl.tokens.comments.format 33
+lang.perl.tokens.constants.format 40
+lang.perl.tokens.non_alphanum.format white
+lang.perl.tokens.regular_expressions.format 36
+lang.perl.tokens.singlequoted_strings.format 37
+lang.perl.tokens.doublequoted_strings.format 38
+lang.perl.tokens.backquoted_strings.format 39
+lang.perl.tokens.reserved_words.format white
+lang.perl.tokens.builtins.format cyan bold
+lang.perl.tokens.array_variables.format red bold
+lang.perl.tokens.hash_variables.format magenta bold
+
+# Java
+
+lang.java.format.default white bold
+lang.java.format.selection 32
+lang.java.format.found yellow inverse
+lang.java.tokens.singlequoted_strings.format 37
+lang.java.tokens.doublequoted_strings.format 38
+lang.java.tokens.reserved_words.format white
+lang.java.tokens.constants.format 40
+lang.java.tokens.comments.format 33
+lang.java.tokens.long_comments.format 33
+lang.java.tokens.non_alphanum.format white
+lang.java.tokens.regular_expressions.format 36
+
+# XML
+
+lang.xml.format.default white
+lang.xml.format.selection 32
+lang.xml.format.found yellow inverse
+lang.xml.tokens.entities.format magenta bold
+lang.xml.tokens.code.format white bold
+lang.xml.tokens.comments.format 33
+lang.xml.tokens.template.format brown
+lang.xml_tag.format.default 41
+lang.xml_tag.format.selection 32
+lang.xml_tag.format.found yellow inverse
+lang.xml_tag.tokens.doublequoted_strings.format 38
+lang.xml_tag.tokens.singlequoted_strings.format 38
+lang.xml_tag.tokens.non_alphanum.format white
+lang.xml_tag.tokens.namespaces.format 43
+lang.xml_comment.format.default 33
+lang.xml_comment.format.selection 32
+lang.xml_comment.format.found yellow inverse
+lang.xml_tag.tokens.attributes ([a-zA-Z_-]+?)=
+lang.xml_tag.tokens.attributes.format 42
+

data/diakonos.conf

@@ -27,6 +27,17 @@ view.wrap.visual true
 # bol_behavior is a synonym for bol_behaviour.
 bol_behaviour alternating-first-char
 
+# eol_behaviour: This specifies where the cursor should go when the
+# end-of-line key (the default is the End key) is pressed.
+#    end: Always move to the right-most column of the line
+#    last-char: Always move to the right-most non-whitespace character
+#    alternating-end: As with 'end', unless the cursor is
+#        already there, in which case, as with 'last-char'.
+#    alternating-last-char: As with 'last-char', unless the cursor is
+#        already there, in which case, as with 'end'.
+# eol_behavior is a synonym for eol_behaviour.
+eol_behaviour alternating-end
+
 # Ensures saved files end with a newline character by adding it if necessary.
 eof_newline false
 
@@ -111,6 +122,7 @@ interaction.choice_delay 3
 # $F  all current buffer filepaths, space-separated
 # $i  get a string from user input
 # $c  temp file containing current clipboard text
+# $k  temp file containing current klipper (KDE clipboard) text
 # $s  temp file containing currently selected text
 
 key left;cursorLeft
@@ -149,10 +161,12 @@ key esc up;scrollUp
 key esc [ 1 ; 3 A    scrollUp
 key esc [ 1 ; 5 A    scrollUp
 key keycode520       scrollUp
+key keycode521       scrollUp
 key esc down;scrollDown
 key esc [ 1 ; 3 B    scrollDown
 key esc [ 1 ; 5 B    scrollDown
 key keycode513       scrollDown
+key keycode514       scrollDown
 key esc right;seek /(?:^|\W)(\w)|\w(\W|$)/
 key esc [ 1 ; 3 C    seek /\w(\W|$)|(?:^|\W)(\w)/
 key esc [ 1 ; 5 C    seek /\w(\W|$)|(?:^|\W)(\w)/
@@ -250,6 +264,15 @@ key ctrl+space;anchorSelection
 key ctrl+c;copySelection
 key ctrl+x;cutSelection
 key alt+u;removeSelection
+
+# If you are using KDE, you can uncomment these lines to synchronize
+# the Diakonos clipboard with the KDE clipboard
+#key ctrl+c      copy_selection_to_klipper
+#key ctrl+x      cut_selection_to_klipper
+#key ctrl+v      paste_from_klipper
+#key ctrl+k      delete_and_store_line_to_klipper
+#key ctrl+alt+k  delete_to_eol_to_klipper
+
 key ctrl+b         select_block
 # Select file diff in a patch
 key ctrl+alt+d f   select_block /^Index: /, /^(Index: |$)/, false
@@ -544,7 +567,7 @@ lang.ruby.tokens.reserved_words \b(__FILE__|and|def|end|in|or|self|unless|__LINE
 lang.ruby.tokens.reserved_words.format white
 lang.ruby.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
 lang.ruby.tokens.constants.format yellow bold
-lang.ruby.tokens.symbols (:[a-z_][a-z_0-9]*)
+lang.ruby.tokens.symbols [^:](:[a-zA-Z_][a-zA-Z_0-9]*)
 lang.ruby.tokens.symbols.format white bold
 lang.ruby.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;~]
 lang.ruby.tokens.non_alphanum.format white
@@ -746,6 +769,8 @@ lang.java.indent.unindenters (\})
 lang.java.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
 lang.java.indent.ignore ^(.+:|\s*?)$
 lang.java.context.ignore ^(.+:|\s*\{?)$
+lang.java.closers.for.regexp for$
+lang.java.closers.for.closer { |m| "( $i = 0; $i < limit; $i++ ) {\n%_\n}" }
 
 # C
 
@@ -907,7 +932,7 @@ lang.tcl.indent.indenters (\{)
 lang.tcl.indent.unindenters (\})
 lang.tcl.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
 
-lang.diff.filemask (?:\.(?:diff|patch))$
+lang.diff.filemask (?:\.(?:diff|patch)|COMMIT_EDITMSG)$
 lang.diff.format.default white
 lang.diff.format.selection inverse
 lang.diff.format.found yellow inverse

data/lib/diakonos.rb

@@ -7,20 +7,12 @@
 #
 # Author:: Pistos (irc.freenode.net)
 # http://purepistos.net/diakonos
+# Copyright (c) 2004-2008 Pistos
 #
-# This software is released under the GNU General Public License.
-# http://www.gnu.org/copyleft/gpl.html
+# This software is released under the MIT licence.
+# See the LICENCE file included with this program, or
+# http://www.opensource.org/licenses/mit-license.php
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
 require 'curses'
 require 'open3'
 require 'thread'
@@ -55,8 +47,8 @@ require 'diakonos/readline'
 
 module Diakonos
 
-    VERSION = '0.8.4'
-    LAST_MODIFIED = 'May 23, 2008'
+    VERSION = '0.8.5'
+    LAST_MODIFIED = 'August 27, 2008'
 
     DONT_ADJUST_ROW = false
     ADJUST_ROW = true
@@ -101,6 +93,11 @@ module Diakonos
     BOL_ALT_ZERO = 2
     BOL_ALT_FIRST_CHAR = 3
 
+    EOL_END = 0
+    EOL_LAST_CHAR = 1
+    EOL_ALT_END = 2
+    EOL_ALT_LAST_CHAR = 3
+
     FORCE_REVERT = true
     ASK_REVERT = false
     
@@ -117,25 +114,30 @@ module Diakonos
         'changeSessionSetting',
         'clearMatches',
         'closeFile',
-        'collapseWhitespace',
         'close_code',
+        'collapseWhitespace',
         'copySelection',
+        'copy_selection_to_klipper',
         'cursorBOF',
         'cursorBOL',
+        'cursorBOV',
         'cursorDown',
         'cursorEOF',
         'cursorEOL',
-        'cursorBOV',
-        'cursorTOV',
         'cursorLeft',
         'cursorReturn',
         'cursorRight',
+        'cursorTOV',
         'cursorUp',
         'cutSelection',
+        'cut_selection_to_klipper',
         'delete',
         'deleteAndStoreLine',
         'deleteLine',
         'deleteToEOL',
+        'delete_and_store_line_to_klipper',
+        'delete_line_to_klipper',
+        'delete_to_EOL_to_klipper',
         'evaluate',
         'execute',
         'find',
@@ -167,6 +169,7 @@ module Diakonos
         'parsedIndent',
         'paste',
         'pasteShellResult',
+        'paste_from_klipper',
         'playMacro',
         'popTag',
         'printKeychain',
@@ -178,11 +181,11 @@ module Diakonos
         'revert',
         'saveFile',
         'saveFileAs',
-        'select_block',
         'scrollDown',
         'scrollUp',
         'searchAndReplace',
         'seek',
+        'select_block',
         'setBufferType',
         'setReadOnly',
         'shell',
@@ -599,7 +602,7 @@ class Diakonos
                             end
                     end
                 when "context.visible", "context.combined", "eof_newline", "view.nonfilelines.visible",
-                        /^lang\.(.+?)\.indent\.(?:auto|roundup|using_tabs)$/,
+                        /^lang\.(.+?)\.indent\.(?:auto|roundup|using_tabs|closers)$/,
                         "found_cursor_start", "convert_tabs", 'delete_newline_on_delete_to_eol'
                     @settings[ command ] = arg.to_b
                 when "context.format", "context.separator.format", "status.format"
@@ -636,6 +639,17 @@ class Diakonos
                         else # default
                             @settings[ "bol_behaviour" ] = BOL_ALT_FIRST_CHAR
                     end
+                when "eol_behaviour", "eol_behavior"
+                    case arg.downcase
+                        when "end"
+                            @settings[ "eol_behaviour" ] = EOL_END
+                        when "last-char"
+                            @settings[ "eol_behaviour" ] = EOL_LAST_CHAR
+                        when "alternating-last-char"
+                            @settings[ "eol_behaviour" ] = EOL_ALT_FIRST_CHAR
+                        else # default
+                            @settings[ "eol_behaviour" ] = EOL_ALT_END
+                    end
                 when "context.delay", 'interaction.blink_duration', 'interaction.choice_delay'
                     @settings[ command ] = arg.to_f
             end
@@ -870,9 +884,11 @@ class Diakonos
 
     def switchTo( buffer )
         switched = false
-        if buffer != nil
+        if buffer
             @buffer_stack -= [ @current_buffer ]
-            @buffer_stack.push @current_buffer if @current_buffer != nil
+            if @current_buffer
+              @buffer_stack.push @current_buffer
+            end
             @current_buffer = buffer
             updateStatusLine
             updateContextLine
@@ -880,7 +896,7 @@ class Diakonos
             switched = true
         end
         
-        return switched
+        switched
     end
     protected :switchTo
 
@@ -1126,7 +1142,7 @@ class Diakonos
             end
             number += 1
         end
-        return buffer_number
+        buffer_number
     end
 
     def subShellVariables( string )
@@ -1162,6 +1178,15 @@ class Diakonos
             retval.gsub!( /\$c/, clip_filename )
         end
         
+        # Current klipper (KDE clipboard) text
+        if retval =~ /\$k/
+            clip_filename = @diakonos_home + "/clip.txt"
+            File.open( clip_filename, "w" ) do |clipfile|
+                clipfile.puts( `dcop klipper klipper getClipboardContents` )
+            end
+            retval.gsub!( /\$k/, clip_filename )
+        end
+        
         # Currently selected text
         if retval =~ /\$s/
             text_filename = @diakonos_home + "/selected.txt"
@@ -1550,6 +1575,31 @@ class Diakonos
         removeSelection
     end
 
+    def copy_selection_to_klipper
+      if send_to_klipper( @current_buffer.selected_text )
+        removeSelection
+      end
+    end
+    
+    def write_to_clip_file( text )
+      clip_filename = @diakonos_home + "/clip.txt"
+      File.open( clip_filename, "w" ) do |f|
+        f.print text
+      end
+      clip_filename
+    end
+    
+    # Returns true iff some text was copied to klipper.
+    def send_to_klipper( text )
+      return false if text.nil?
+      
+      clip_filename = write_to_clip_file( text.join( "\n" ) )
+      # A little shell sorcery to ensure the shell doesn't strip off trailing newlines.
+      # Thank you to pgas from irc.freenode.net#bash for help with this.
+      `clipping=$(cat #{clip_filename};printf "_"); dcop klipper klipper setClipboardContents "${clipping%_}"`
+      true
+    end
+
     # Returns true iff the cursor changed positions
     def cursorDown
         return @current_buffer.cursorTo( @current_buffer.last_row + 1, @current_buffer.last_col, Buffer::DO_DISPLAY, Buffer::STOPPED_TYPING, DONT_ADJUST_ROW )
@@ -1578,8 +1628,7 @@ class Diakonos
     end
 
     def cursorEOL
-        y = @win_main.cury
-        @current_buffer.cursorTo( @current_buffer.last_row, @current_buffer.lineAt( y ).length, Buffer::DO_DISPLAY )
+      @current_buffer.cursorToEOL
     end
 
     def cursorEOF
@@ -1604,27 +1653,60 @@ class Diakonos
     def cutSelection
         delete if @clipboard.addClip( @current_buffer.copySelection )
     end
+    
+    def cut_selection_to_klipper
+      if send_to_klipper( @current_buffer.selected_text )
+        delete
+      end
+    end
 
     def delete
         @current_buffer.delete
     end
 
+    def delete_and_store_line_to_klipper
+      removed_text = @current_buffer.deleteLine
+      if removed_text
+        if @last_commands[ -1 ] =~ /^delete_and_store_line_to_klipper/
+          clip_filename = write_to_clip_file( removed_text << "\n" )
+          `clipping="$(dcop klipper klipper getClipboardContents)\n$(cat #{clip_filename};printf "_")"; dcop klipper klipper setClipboardContents "${clipping%_}"`
+        else
+          send_to_klipper [ removed_text, "" ]
+        end
+      end
+    end
+
     def deleteAndStoreLine
+      removed_text = @current_buffer.deleteLine
+      if removed_text
+        clip = [ removed_text, "" ]
+        if @last_commands[ -1 ] =~ /^deleteAndStoreLine/
+          @clipboard.appendToClip clip
+        else
+          @clipboard.addClip clip
+        end
+      end
+    end
+
+    def delete_line_to_klipper
         removed_text = @current_buffer.deleteLine
         if removed_text
-            if @last_commands[ -1 ] =~ /^deleteAndStoreLine/
-                @clipboard.appendToClip( [ removed_text, "" ] )
-            else
-                @clipboard.addClip( [ removed_text, "" ] )
-            end
+          send_to_klipper [ removed_text, "" ]
         end
     end
-
+    
     def deleteLine
         removed_text = @current_buffer.deleteLine
         @clipboard.addClip( [ removed_text, "" ] ) if removed_text
     end
 
+    def delete_to_EOL_to_klipper
+        removed_text = @current_buffer.deleteToEOL
+        if removed_text
+          send_to_klipper removed_text
+        end
+    end
+    
     def deleteToEOL
         removed_text = @current_buffer.deleteToEOL
         @clipboard.addClip( removed_text ) if removed_text
@@ -1942,65 +2024,76 @@ class Diakonos
 
     # Returns the buffer of the opened file, or nil.
     def openFile( filename = nil, read_only = false, force_revert = ASK_REVERT )
-        do_open = true
-        buffer = nil
-        if filename != nil
-            buffer_key = filename
-            if(
-                (not force_revert) and
-                    ( (existing_buffer = @buffers[ filename ]) != nil ) and
-                    ( filename !~ /\.diakonos/ )
+      do_open = true
+      buffer = nil
+      if filename.nil?
+        buffer_key = @untitled_id
+        @untitled_id += 1
+      else
+        if filename =~ /^(.+):(\d+)$/
+          filename, line_number = $1, ( $2.to_i - 1 )
+        end
+        buffer_key = filename
+        if(
+          (not force_revert) and
+          ( (existing_buffer = @buffers[ filename ]) != nil ) and
+          ( filename !~ /\.diakonos/ )
+        )
+          switchTo( existing_buffer )
+          choice = getChoice(
+            "Revert to on-disk version of #{existing_buffer.nice_name}?",
+            [ CHOICE_YES, CHOICE_NO ]
+          )
+          case choice
+          when CHOICE_NO
+            do_open = false
+          end
+        end
+      
+        if FileTest.exist?( filename )
+          # Don't try to open non-files (i.e. directories, pipes, sockets, etc.)
+          do_open &&= FileTest.file?( filename )
+        end
+      end
+      
+      if do_open
+        # Is file readable?
+        
+        # Does the "file" utility exist?
+        if(
+          filename and
+          @settings[ 'use_magic_file' ] and
+          FileTest.exist?( "/usr/bin/file" ) and
+          FileTest.exist?( filename ) and
+          /\blisting\.txt\b/ !~ filename
+        )
+          file_type = `/usr/bin/file -L #{filename}`
+          if file_type !~ /text/ and file_type !~ /empty$/
+            choice = getChoice(
+              "#{filename} does not appear to be readable.  Try to open it anyway?",
+              [ CHOICE_YES, CHOICE_NO ],
+              CHOICE_NO
             )
-                switchTo( existing_buffer )
-                choice = getChoice(
-                    "Revert to on-disk version of #{existing_buffer.nice_name}?",
-                    [ CHOICE_YES, CHOICE_NO ]
-                )
-                case choice
-                    when CHOICE_NO
-                        do_open = false
-                end
+            case choice
+            when CHOICE_NO
+              do_open = false
             end
             
-            if FileTest.exist?( filename )
-                # Don't try to open non-files (i.e. directories, pipes, sockets, etc.)
-                do_open &&= FileTest.file?( filename )
-            end
-        else
-            buffer_key = @untitled_id
-            @untitled_id += 1
+          end
         end
         
         if do_open
-            # Is file readable?
-            
-            # Does the "file" utility exist?
-            if @settings[ 'use_magic_file' ] and FileTest.exist?( "/usr/bin/file" ) and filename != nil and FileTest.exist?( filename ) and /\blisting\.txt\b/ !~ filename
-                file_type = `/usr/bin/file -L #{filename}`
-                if file_type !~ /text/ and file_type !~ /empty$/
-                    choice = getChoice(
-                        "#{filename} does not appear to be readable.  Try to open it anyway?",
-                        [ CHOICE_YES, CHOICE_NO ],
-                        CHOICE_NO
-                    )
-                    case choice
-                        when CHOICE_NO
-                            do_open = false
-                    end
-                    
-                end
-            end
-            
-            if do_open
-                buffer = Buffer.new( self, filename, read_only )
-                @buffers[ buffer_key ] = buffer
-                switchTo( buffer )
-            end
+          buffer = Buffer.new( self, filename, buffer_key, read_only )
+          @buffers[ buffer_key ] = buffer
+          if switchTo( buffer ) and line_number
+            @current_buffer.goToLine( line_number, 0 )
+          end
         end
-        
-        return buffer
+      end
+      
+      buffer
     end
-
+  
     def openFileAsk
         if @current_buffer != nil and @current_buffer.name != nil
             path = File.expand_path( File.dirname( @current_buffer.name ) ) + "/"
@@ -2099,6 +2192,12 @@ class Diakonos
     def paste
         @current_buffer.paste @clipboard.clip
     end
+    
+    def paste_from_klipper
+      text = `dcop klipper klipper getClipboardContents`.split( "\n", -1 )
+      text.pop  # getClipboardContents puts an extra newline on end
+      @current_buffer.paste text
+    end
 
     def playMacro( name = nil )
         macro, input_history = @macros[ name ]
@@ -2396,7 +2495,7 @@ class Diakonos
         buffer_number = buffer_number_.to_i
         return if buffer_number < 1
         buffer_name = bufferNumberToName( buffer_number )
-        if buffer_name != nil
+        if buffer_name
             switchTo( @buffers[ buffer_name ] )
         end
     end