diakonos 0.8.3 → 0.8.4

data/CHANGELOG

@@ -1,6 +1,24 @@
 Diakonos Changelog
 ------------------
 
+0.8.5
+
+- Added 256 colour support.
+
+0.8.4
+
+- Added joinLines function.
+- Added "yes and (s)top" as a find-and-replace option.
+- Added '-h' to be synonymous with '--help'.
+- Added "Ctrl-Q to quit" to opening message.
+- Added close_code feature.
+- Added list selection.
+- Added buffer selection.
+- Added delete_newline_on_delete_to_eol option.
+- Added select_block command.
+- Slight (8%) display performance improvement.
+- Moved source code from svn to github.com.
+
 0.8.3
 
 - Extended ASCII characters (128 to 254) are now typeable.

data/README

@@ -7,20 +7,18 @@ INSTALLATION
 ============
 
 There are three ways to install Ruby:
-- by rubygems (recommended)
-- by setup.rb
-- manual file copy
+  * by rubygems (recommended)
+  * from the tarball using setup.rb
+  * manual file copy
 
-Installing via Rubygems
------------------------
+=== Installing via Rubygems ===
 
 Since version 0.8.3, this is the recommended way of installing Diakonos.
 Run the following command as a user with appropriate permissions:
 
   gem install diakonos
-  
-Intalling using setup.rb
-------------------------
+
+=== Installing from tarball using setup.rb ===
 
 First obtain the diakonos tarball.  This can be found at
 http://purepistos.net/diakonos .  Unpack the tarball somewhere.
@@ -39,8 +37,7 @@ such as /usr/bin; and copies lib/* into the system-wide ruby library path,
 such as /usr/lib/ruby/site_ruby/1.8 .  You may need root priveleges on the
 system in order to install to system-wide places like /usr/bin .
 
-Installing by Manual Copy
--------------------------
+=== Installing from tarball by manual copy ===
 
 First obtain the diakonos tarball.  This can be found at
 http://purepistos.net/diakonos .
@@ -68,8 +65,12 @@ For a quick introduction, see
 
 http://wiki.purepistos.net/doku.php?id=Diakonos:Getting-Started
 
+----------------------------------------------------------------
+
+The source code repository is at http://github.com/Pistos/diakonos/tree/master .
+
 Send comments, feedback and tech support requests to
-irc.freenode.net:6667#mathetes or http://purepistos.net/forums .
+irc.freenode.net:6667#mathetes or http://linis.purepistos.net .
 
 Pistos
 http://purepistos.net/diakonos

data/diakonos.conf

@@ -30,6 +30,8 @@ bol_behaviour alternating-first-char
 # Ensures saved files end with a newline character by adding it if necessary.
 eof_newline false
 
+delete_newline_on_delete_to_eol false
+
 # Specifies whether the cursor should be at the end (false) of found text, or the
 # beginning (true).  
 found_cursor_start false
@@ -38,7 +40,7 @@ max_clips 30
 
 # The maximum number of undo lines held in memory per file
 # Smaller files will be able to have more undo levels.
-max_undo_lines 100000
+max_undo_lines 16384
 
 convert_tabs false
 
@@ -123,16 +125,20 @@ key home;cursorBOL
 key esc O H;cursorBOL
 key esc [ H;cursorBOL
 key esc [ 1 ~   cursorBOL
+key esc [ 7 ~   cursorBOL
 key end;cursorEOL
 key esc O F;cursorEOL
 key esc [ F;cursorEOL
 key esc [ 4 ~;cursorEOL
+key esc [ 8 ~;cursorEOL
 key pageup;pageUp
 key pagedown;pageDown
 key ctrl+a;cursorBOL
 key ctrl+e;cursorEOL
 key alt+<;cursorBOF
+key esc [ 1 ; 5 H   cursorBOF
 key alt+>;cursorEOF
+key esc [ 1 ; 5 F   cursorEOF
 key alt+,;cursorTOV
 key alt+.;cursorBOV
 key ctrl+j;cursorReturn
@@ -151,10 +157,12 @@ 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)/
 key keycode517       seek /\w(\W|$)|(?:^|\W)(\w)/
+key keycode518       seek /\w(\W|$)|(?:^|\W)(\w)/
 key esc left;seek /\w(\W|$)|(?:^|\W)(\w)/, "up"
 key esc [ 1 ; 3 D    seek /\w(\W|$)|(?:^|\W)(\w)/, "up"
 key esc [ 1 ; 5 D    seek /\w(\W|$)|(?:^|\W)(\w)/, "up"
 key keycode515       seek /\w(\W|$)|(?:^|\W)(\w)/, "up"
+key keycode516       seek /\w(\W|$)|(?:^|\W)(\w)/, "up"
 
 key ctrl+g;goToLineAsk
 key alt+b alt+b;toggleBookmark
@@ -192,10 +200,12 @@ key tab;parsedIndent
 key alt+i;indent
 key esc i;indent
 key esc I;unindent
+key esc [ Z       unindent
 key keycode353    unindent
 #key tab;insertSpaces 4
 #key tab;insertTab
 key ctrl+t;insertTab
+key alt+j    joinLines
 
 key f1            help
 key esc O P       help
@@ -233,12 +243,19 @@ key alt+9;switchToBufferNumber 9
 key alt+0;switchToBufferNumber 10
 key alt+-;switchToPreviousBuffer
 key alt+=;switchToNextBuffer
+key ctrl+alt+b    list_buffers
 
 key ctrl+space;anchorSelection
 #key ctrl+space;toggleSelection
 key ctrl+c;copySelection
 key ctrl+x;cutSelection
 key alt+u;removeSelection
+key ctrl+b         select_block
+# Select file diff in a patch
+key ctrl+alt+d f   select_block /^Index: /, /^(Index: |$)/, false
+# Select a diff hunk in a patch
+key ctrl+alt+d h   select_block /^@@ /, /^(@@ |$)/, false
+
 key ctrl+alt+v;showClips
 key ctrl+v;paste
 key ctrl+y;unundo
@@ -262,6 +279,7 @@ key esc [ 2 8 ~   findAgain "up"
 key esc O 2 R;findAgain "up"
 key ctrl+r;searchAndReplace
 key ctrl+alt+u;clearMatches
+key alt+c;close_code
 
 key f2            shell
 key esc O Q       shell
@@ -276,7 +294,6 @@ key f14         evaluate
 key esc O 2 Q   evaluate
 esc [ 2 6 ~     evaluate
 key ctrl+alt+c;shell "ruby -c $f"
-key ctrl+alt+d;shell "php -l $f"
 
 # To use the following:
 # 1) Copy to the clipboard some Ruby code which operates on stdin text and outputs to stdout.
@@ -302,7 +319,10 @@ key f6;repeatLast
 key esc [ 1 7 ~;repeatLast
 key f7;operateOnEachLine
 key f19;operateOnString
-key esc f7;operateOnLines
+key esc [ 1 8 ; 2 ~    operateOnString
+key esc f7             operateOnLines
+key esc [ 1 8 ; 3 ~    operateOnLines
+key keycode319         operateOnLines
 
 # Emacs-like keychains
 
@@ -318,8 +338,9 @@ key esc f7;operateOnLines
 #
 # For a list of colour names, see the list of format codes in the
 # Language Definitions section, below.
-# This colour command is only used when you want to set a different background
-# colour than the terminal default.
+#
+# With this colour command you can set a different background colour than the
+# terminal default.
 #
 # color is a synonym for colour.
 colour 8 white blue
@@ -364,12 +385,14 @@ lang.text.indent.roundup false
 #lang.text.indent.using_tabs true
 lang.text.tabsize 8
 
-lang.xml.filemask \.(xml|rdl|aiml|xhtml)$
+# XML
+
+lang.xml.filemask \.(xml|xsl|rdl|aiml|xhtml)$
 lang.xml.format.default white
 lang.xml.format.selection inverse
 lang.xml.format.found yellow inverse
 lang.xml.tabsize 8
-lang.xml.indent.size 4
+lang.xml.indent.size 2
 lang.xml.indent.auto true
 lang.xml.indent.roundup true
 #lang.xml.indent.using_tabs true
@@ -387,11 +410,13 @@ lang.xml.tokens.template.open \[@--
 lang.xml.tokens.template.close --@\]
 lang.xml.tokens.template.format brown
 lang.xml.tokens.template.change_to perl
+lang.xml.closers.tag.regexp <([^/> ]*)
+lang.xml.closers.tag.closer { |m| "</" + m[ 1 ] + ">" }
 lang.xml_tag.format.default white bold
 lang.xml_tag.format.selection inverse
 lang.xml_tag.format.found yellow inverse
 lang.xml_tag.tabsize 8
-lang.xml_tag.indent.size 4
+lang.xml_tag.indent.size 2
 lang.xml_tag.indent.auto true
 lang.xml_tag.indent.roundup true
 #lang.xml_tag.indent.using_tabs true
@@ -399,23 +424,25 @@ lang.xml_tag.tokens.doublequoted_strings (\".*?[^\\]\")
 lang.xml_tag.tokens.doublequoted_strings.format green bold
 lang.xml_tag.tokens.singlequoted_strings ('.*?[^\\]')
 lang.xml_tag.tokens.singlequoted_strings.format green bold
-lang.xml_tag.tokens.symbols ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.xml_tag.tokens.symbols.format white
+lang.xml_tag.tokens.non_alphanum ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.xml_tag.tokens.non_alphanum.format white
+lang.xml_tag.tokens.namespaces ([a-zA-Z_-]+):
+lang.xml_tag.tokens.namespaces.format yellow bold
 lang.xml_comment.format.default 8
 lang.xml_comment.format.selection inverse
 lang.xml_comment.format.found yellow inverse
 lang.xml_comment.tabsize 8
-lang.xml_comment.indent.size 4
+lang.xml_comment.indent.size 2
 lang.xml_comment.indent.auto true
 lang.xml_comment.indent.roundup true
 #lang.xml_comment.indent.using_tabs true
 
-lang.html.filemask \.(r?html?|php|asp)$
+lang.html.filemask \.([rx]?html?|php|asp)$
 lang.html.format.default white
 lang.html.format.selection inverse
 lang.html.format.found yellow inverse
 lang.html.tabsize 8
-lang.html.indent.size 4
+lang.html.indent.size 2
 lang.html.indent.auto true
 lang.html.indent.roundup true
 #lang.html.indent.using_tabs true
@@ -429,6 +456,14 @@ lang.html.tokens.eruby.open <%
 lang.html.tokens.eruby.close %>
 lang.html.tokens.eruby.format 9 bold
 lang.html.tokens.eruby.change_to ruby
+lang.html.tokens.ezamar.open <\?r
+lang.html.tokens.ezamar.close \?>
+lang.html.tokens.ezamar.format 9 bold
+lang.html.tokens.ezamar.change_to ruby
+lang.html.tokens.ezamar-value.open \#\{
+lang.html.tokens.ezamar-value.close \}
+lang.html.tokens.ezamar-value.format 9 bold
+lang.html.tokens.ezamar-value.change_to ruby
 lang.html.tokens.php.open <\?(?:php)?
 lang.html.tokens.php.close \?>
 lang.html.tokens.php.format 10 bold
@@ -437,6 +472,8 @@ lang.html.tokens.comments.open (<!--)
 lang.html.tokens.comments.close (-->)
 lang.html.tokens.comments.format 8
 lang.html.tokens.comments.change_to html_comment
+lang.html.closers.tag.regexp <([^/> ]*)
+lang.html.closers.tag.closer { |m| "</" + m[ 1 ] + ">" }
 lang.html_tag.format.default white bold
 lang.html_tag.format.selection inverse
 lang.html_tag.format.found yellow inverse
@@ -455,8 +492,8 @@ lang.html_tag.tokens.doublequoted_strings (\".*?[^\\]\")
 lang.html_tag.tokens.doublequoted_strings.format green bold
 lang.html_tag.tokens.singlequoted_strings ('.*?[^\\]')
 lang.html_tag.tokens.singlequoted_strings.format green bold
-lang.html_tag.tokens.symbols ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.html_tag.tokens.symbols.format white
+lang.html_tag.tokens.non_alphanum ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.html_tag.tokens.non_alphanum.format white
 lang.html_comment.format.default 8
 lang.html_comment.format.selection inverse
 lang.html_comment.format.found yellow inverse
@@ -480,7 +517,7 @@ lang.css.indent.roundup true
 lang.css.indent.indenters (\{)
 lang.css.indent.unindenters (\})
 lang.css.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
-lang.css.tokens.properties \b(azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-collapse|border-color|border-spacing|border-style|border-top|border-bottom|border-right|border-left|border-top-color|border-top-style|border-top-width|border-width|border|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-right|margin-top|margin-left|margin-bottom|margin|max-height|max-width|min-height|min-width|orphans|outline-color|outline-style|outline-width|outline|overflow|padding-top|padding-left|padding-right|padding-bottom|padding|page-break-after|page-break-before|page-break-inside|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|table-layout|text-align|text-decoration|text-indent|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index):
+lang.css.tokens.properties \b(azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-collapse|border-color|border-spacing|border-style|border-top|border-bottom|border-right|border-left|border-top-color|border-top-style|border-top-width|border-width|border|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-right|margin-top|margin-left|margin-bottom|margin|max-height|max-width|min-height|min-width|orphans|outline-color|outline-style|outline-width|outline|overflow|padding-top|padding-left|padding-right|padding-bottom|padding|page-break-after|page-break-before|page-break-inside|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|table-layout|text-align|text-decoration|text-indent|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index)\s*:
 lang.css.tokens.properties.format white bold
 lang.css.tokens.colours #[A-Fa-f0-9]{6}|\b(?:aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\b
 lang.css.tokens.colours.format yellow bold
@@ -507,10 +544,12 @@ 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 [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:~]
-lang.ruby.tokens.symbols.format white
-lang.ruby.tokens.class_variables (@[A-Za-z_][A-Za-z_0-9]*)
-lang.ruby.tokens.class_variables.format white bold
+lang.ruby.tokens.symbols (:[a-z_][a-z_0-9]*)
+lang.ruby.tokens.symbols.format white bold
+lang.ruby.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;~]
+lang.ruby.tokens.non_alphanum.format white
+lang.ruby.tokens.instance_variables (@[A-Za-z_][A-Za-z_0-9]*)
+lang.ruby.tokens.instance_variables.format white bold
 lang.ruby.tokens.comments (#.*)
 lang.ruby.tokens.comments.format 8 bold
 lang.ruby.tokens.regular_expressions (\/.+?[^\\]\/)
@@ -519,10 +558,28 @@ lang.ruby.tokens.regular_expressions2 (%r\{.+?[^\}]\})
 lang.ruby.tokens.regular_expressions2.format red bold
 lang.ruby.tokens.doublequoted_strings (\".*?[^\\]\"|\"\")
 lang.ruby.tokens.doublequoted_strings.format green bold
+lang.ruby.tokens.interpolated_string.open (%Q?\{)
+lang.ruby.tokens.interpolated_string.close (\})
+lang.ruby.tokens.interpolated_string.format green bold
+lang.ruby.tokens.interpolated_string.change_to interpolated_ruby
+lang.interpolated_ruby.format.default green bold
+lang.interpolated_ruby.tokens.interpolation.open (#\{)
+lang.interpolated_ruby.tokens.interpolation.close (\})
+lang.interpolated_ruby.tokens.interpolation.format 12 bold
+lang.interpolated_ruby.tokens.interpolation.change_to ruby
 lang.ruby.tokens.singlequoted_strings ('.*?[^\\]'|'')
 lang.ruby.tokens.singlequoted_strings.format green bold
 lang.ruby.tokens.backquoted_strings (`.*?[^\\]`|``)
 lang.ruby.tokens.backquoted_strings.format red bold
+lang.ruby.tokens.interpolated_exec_string.open (%x\{)
+lang.ruby.tokens.interpolated_exec_string.close (\})
+lang.ruby.tokens.interpolated_exec_string.format red bold
+lang.ruby.tokens.interpolated_exec_string.change_to interpolated_exec_ruby
+lang.interpolated_exec_ruby.format.default red bold
+lang.interpolated_exec_ruby.tokens.interpolation.open (#\{)
+lang.interpolated_exec_ruby.tokens.interpolation.close (\})
+lang.interpolated_exec_ruby.tokens.interpolation.format 9 bold
+lang.interpolated_exec_ruby.tokens.interpolation.change_to ruby
 lang.ruby.tokens.character_codes \W(\?\S)
 lang.ruby.tokens.character_codes.format magenta bold
 lang.ruby.tokens.long_comments.open ^=begin
@@ -532,12 +589,13 @@ lang.ruby.tokens.sql_string.open (<<-EOSQL)
 lang.ruby.tokens.sql_string.close (EOSQL)
 lang.ruby.tokens.sql_string.format 1
 lang.ruby.tokens.sql_string.change_to sql
-lang.ruby.indent.size 4
+lang.ruby.indent.size 2
 lang.ruby.indent.auto true
 lang.ruby.indent.roundup true
 #lang.ruby.indent.using_tabs true
-lang.ruby.indent.indenters \b(do|def|begin|ensure|when|case|else|for|while|elsif|if|class|module|rescue)\b|([{\[(]$|\{\s*\|[\w\s,]*\|\s*$)
-lang.ruby.indent.unindenters \b(end|else|elsif|when|rescue)\b|(^\s+[\]})])
+lang.ruby.tabsize 2
+lang.ruby.indent.indenters ^\s*(case|def|begin|ensure|when|else|ensure|for|while|elsif|if|class|module|rescue)\b|([{\[(]$|\{\s*\|[\w\s,]*\|\s*$)|\b(do)\b
+lang.ruby.indent.unindenters ^\s*(end|else|elsif|ensure|when|rescue)\b|(^\s+[\]})])
 lang.ruby.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(`.+?[^\\]`)|(\/.+?[^\\]\/)|(^\s*#.*)|\S\s+if
 lang.ruby.indent.ignore ^\s*$
 lang.ruby.context.ignore ^=(begin|end)$
@@ -561,8 +619,8 @@ lang.php.tokens.comments (\/\/.*)
 lang.php.tokens.comments.format 8 bold
 lang.php.tokens.preprocessor (^\s*#.*)
 lang.php.tokens.preprocessor.format yellow bold
-lang.php.tokens.symbols ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.php.tokens.symbols.format white
+lang.php.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.php.tokens.non_alphanum.format white
 lang.php.tokens.long_comments.open \/\*
 lang.php.tokens.long_comments.close \*\/
 lang.php.tokens.long_comments.format 8 bold
@@ -595,8 +653,8 @@ lang.perl.tokens.comments (#.*)
 lang.perl.tokens.comments.format 8 bold
 lang.perl.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
 lang.perl.tokens.constants.format yellow bold
-lang.perl.tokens.symbols [!#^&*()\[\]{}/?=+\-\\|,<.>;:~]
-lang.perl.tokens.symbols.format white
+lang.perl.tokens.non_alphanum [!#^&*()\[\]{}/?=+\-\\|,<.>;:~]
+lang.perl.tokens.non_alphanum.format white
 lang.perl.tokens.regular_expressions (\/.+?[^\\]\/)
 lang.perl.tokens.regular_expressions.format red bold
 lang.perl.tokens.doublequoted_strings (\".*?[^\\]\")
@@ -634,8 +692,8 @@ lang.python.format.selection inverse
 lang.python.format.found yellow inverse
 lang.python.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
 lang.python.tokens.constants.format yellow bold
-lang.python.tokens.symbols [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:~]
-lang.python.tokens.symbols.format white
+lang.python.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:~]
+lang.python.tokens.non_alphanum.format white
 lang.python.tokens.comments (#.*)
 lang.python.tokens.comments.format 8 bold
 lang.python.tokens.doublequoted_strings (\".*?[^\\]\")
@@ -658,7 +716,7 @@ lang.python.indent.ignore ^\s*$
 
 # Java
 
-lang.java.filemask \.java$
+lang.java.filemask \.(?:java|js)$
 lang.java.format.default white bold
 lang.java.format.selection inverse
 lang.java.format.found yellow inverse
@@ -672,11 +730,13 @@ lang.java.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
 lang.java.tokens.constants.format yellow bold
 lang.java.tokens.comments (\/\/.*)
 lang.java.tokens.comments.format 8 bold
-lang.java.tokens.symbols ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.java.tokens.symbols.format white
+lang.java.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.java.tokens.non_alphanum.format white
 lang.java.tokens.long_comments.open \/\*
 lang.java.tokens.long_comments.close \*\/
 lang.java.tokens.long_comments.format 8 bold
+lang.java.tokens.regular_expressions (\/.+?[^\\]\/)
+lang.java.tokens.regular_expressions.format red bold
 lang.java.indent.size 4
 lang.java.indent.auto true
 lang.java.indent.roundup false
@@ -705,8 +765,8 @@ lang.c.tokens.comments (\/\/.*)
 lang.c.tokens.comments.format 8 bold
 lang.c.tokens.preprocessor (^\s*#.*)
 lang.c.tokens.preprocessor.format yellow bold
-lang.c.tokens.symbols ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.c.tokens.symbols.format white
+lang.c.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.c.tokens.non_alphanum.format white
 lang.c.tokens.long_comments.open \/\*
 lang.c.tokens.long_comments.close \*\/
 lang.c.tokens.long_comments.format 8 bold
@@ -787,8 +847,8 @@ lang.sql.tokens.comments (--.*)
 lang.sql.tokens.comments.format 8 bold
 lang.sql.tokens.singlequoted_strings ('.*?[^\\]')
 lang.sql.tokens.singlequoted_strings.format green bold
-lang.sql.tokens.symbols ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.sql.tokens.symbols.format white
+lang.sql.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.sql.tokens.non_alphanum.format white
 lang.sql.tokens.typos (==)
 lang.sql.tokens.typos.format 15 bold
 lang.sql.indent.indenters ((?:\(|BEGIN|DECLARE|FROM|LOOP|ORDER BY|SELECT|SET|WHERE)$)
@@ -837,8 +897,8 @@ lang.tcl.tokens.comments (^\s*#.*)
 lang.tcl.tokens.comments.format 8 bold
 lang.tcl.tokens.reserved_words \b(encoding|incr|pid|tcl_endOfWord|Tcl|eof|info|tcl_findLibrary|after|error|interp|pkg_mkIndex|tcl_startOfNextWord|append|eval|join|proc|tcl_startOfPreviousWord|array|exec|lappend|puts|tcl_wordBreakAfter|auto_execok|exit|lassign|pwd|tcl_wordBreakBefore|auto_import|expr|lindex|re_syntax|tcltest|auto_load|fblocked|linsert|read|tclvars|auto_mkindex|fconfigure|list|regexp|tell|auto_mkindex_old|fcopy|llength|registry|time|auto_qualify|file|load|regsub|trace|auto_reset|fileevent|lrange|rename|unknown|bgerror|filename|lrepeat|resource|unload|binary|flush|lreplace|return|unset|break|for|lsearch|scan|update|catch|foreach|lset|seek|uplevel|cd|format|lsort|set|upvar|clock|gets|memory|socket|variable|close|glob|msgcat|source|vwait|concat|global|namespace|split|while|continue|history|open|string|dde|http|package|subst|dict|if|parray|switch)\b
 lang.tcl.tokens.reserved_words.format white
-lang.tcl.tokens.symbols ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.tcl.tokens.symbols.format white
+lang.tcl.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.tcl.tokens.non_alphanum.format white
 lang.tcl.tokens.variables (\$[A-Za-z_][A-Za-z_0-9]*)\b
 lang.tcl.tokens.variables.format yellow bold
 lang.tcl.tokens.doublequoted_strings (\".*?[^\\]\")
@@ -957,4 +1017,7 @@ lang.haml.tokens.line_joiner.format 12 bold
 # If a setting is specified again, it overrides the previous setting given
 # higher up in the configuration file(s).
 
-include ~/.diakonos/cucumber.conf
+include ~/.diakonos/pistos.conf
+
+# Uncomment this line if your terminal supports 256 colours.
+#include ~/.diakonos/diakonos-256-colour.conf

data/lib/diakonos.rb

@@ -55,8 +55,8 @@ require 'diakonos/readline'
 
 module Diakonos
 
-    VERSION = '0.8.3'
-    LAST_MODIFIED = 'February 7, 2007'
+    VERSION = '0.8.4'
+    LAST_MODIFIED = 'May 23, 2008'
 
     DONT_ADJUST_ROW = false
     ADJUST_ROW = true
@@ -84,15 +84,17 @@ module Diakonos
     CHOICE_CANCEL = 3
     CHOICE_YES_TO_ALL = 4
     CHOICE_NO_TO_ALL = 5
+    CHOICE_YES_AND_STOP = 6
     CHOICE_KEYS = [
         [ ?n, ?N ],
         [ ?y, ?Y ],
         [ ?a, ?A ],
         [ ?c, ?C, ESCAPE, CTRL_C, CTRL_D, CTRL_Q ],
         [ ?e ],
-        [ ?o ]
+        [ ?o ],
+        [ ?s ],
     ]
-    CHOICE_STRINGS = [ '(n)o', '(y)es', '(a)ll', '(c)ancel', 'y(e)s to all', 'n(o) to all' ]
+    CHOICE_STRINGS = [ '(n)o', '(y)es', '(a)ll', '(c)ancel', 'y(e)s to all', 'n(o) to all', 'yes and (s)top' ]
 
     BOL_ZERO = 0
     BOL_FIRST_CHAR = 1
@@ -116,6 +118,7 @@ module Diakonos
         'clearMatches',
         'closeFile',
         'collapseWhitespace',
+        'close_code',
         'copySelection',
         'cursorBOF',
         'cursorBOL',
@@ -149,6 +152,8 @@ module Diakonos
         'indent',
         'insertSpaces',
         'insertTab',
+        'joinLines',
+        'list_buffers',
         'loadConfiguration',
         'loadScript',
         'newFile',
@@ -173,6 +178,7 @@ module Diakonos
         'revert',
         'saveFile',
         'saveFileAs',
+        'select_block',
         'scrollDown',
         'scrollUp',
         'searchAndReplace',
@@ -200,7 +206,7 @@ module Diakonos
 class Diakonos
     attr_reader :win_main, :settings, :token_regexps, :close_token_regexps,
         :token_formats, :diakonos_home, :script_dir, :diakonos_conf, :display_mutex,
-        :indenters, :unindenters, :clipboard, :do_display,
+        :indenters, :unindenters, :closers, :clipboard, :do_display,
         :current_buffer, :list_filename, :hooks, :last_commands, :there_was_non_movement
 
 
@@ -268,7 +274,7 @@ class Diakonos
         while argv.length > 0
             arg = argv.shift
             case arg
-                when '--help'
+                when '-h', '--help'
                     printUsage
                     exit 1
                 when '-ro'
@@ -372,26 +378,26 @@ class Diakonos
         end
     end
     
-    def fetch_conf( location = "tags/v#{VERSION}" )
-        require 'open-uri'
-        found = false
-        puts "Fetching configuration from #{location}..."
-        
-        begin
-            open( "http://rome.purepistos.net/issues/diakonos/browser/#{location}/diakonos.conf?format=raw" ) do |http|
-                text = http.read
-                if Regexp.new( "No node /#{location}/diakonos.conf" ) !~ text
-                    found = true
-                    File.open( @diakonos_conf, 'w' ) do |f|
-                        f.puts text
-                    end
-                end
-            end
-        rescue OpenURI::HTTPError => e
-            $stderr.puts "Failed to fetch from #{location}."
-        end
-            
-        return found
+    def fetch_conf( location = "v#{VERSION}" )
+      require 'open-uri'
+      found = false
+      puts "Fetching configuration from #{location}..."
+      
+      begin
+        open( "http://github.com/Pistos/diakonos/tree/#{location}/diakonos.conf?raw=true" ) do |http|
+          text = http.read
+          if text =~ /key/ and text =~ /colour/ and text =~ /lang/
+            found = true
+            File.open( @diakonos_conf, 'w' ) do |f|
+              f.puts text
+            end
+          end
+        end
+      rescue OpenURI::HTTPError => e
+        $stderr.puts "Failed to fetch from #{location}."
+      end
+      
+      return found
     end
     
     def loadConfiguration
@@ -429,7 +435,7 @@ class Diakonos
             case answer
                 when /^y/i
                     if not fetch_conf
-                        fetch_conf 'trunk'
+                        fetch_conf 'master'
                     end
             end
             
@@ -448,6 +454,7 @@ class Diakonos
         @unindenters = Hash.new
         @filemasks = Hash.new
         @bangmasks = Hash.new
+        @closers = Hash.new
 
         @settings = Hash.new
         # Setup some defaults
@@ -573,9 +580,27 @@ class Diakonos
                     @filemasks[ $1 ] = Regexp.new arg
                 when /^lang\.(.+?)\.bangmask$/
                     @bangmasks[ $1 ] = Regexp.new arg
+                when /^lang\.(.+?)\.closers\.(.+?)\.(.+?)$/
+                    @closers[ $1 ] ||= Hash.new
+                    @closers[ $1 ][ $2 ] ||= Hash.new
+                    @closers[ $1 ][ $2 ][ $3.to_sym ] = case $3
+                        when 'regexp'
+                            Regexp.new arg
+                        when 'closer'
+                            begin
+                                eval( "Proc.new " + arg )
+                            rescue Exception => e
+                                showException(
+                                    e,
+                                    [
+                                        "Failed to process Proc for #{command}.",
+                                    ]
+                                )
+                            end
+                    end
                 when "context.visible", "context.combined", "eof_newline", "view.nonfilelines.visible",
                         /^lang\.(.+?)\.indent\.(?:auto|roundup|using_tabs)$/,
-                        "found_cursor_start", "convert_tabs"
+                        "found_cursor_start", "convert_tabs", 'delete_newline_on_delete_to_eol'
                     @settings[ command ] = arg.to_b
                 when "context.format", "context.separator.format", "status.format"
                     @settings[ command ] = arg.toFormatting
@@ -697,7 +722,7 @@ class Diakonos
             hook.sort { |a,b| a[ :priority ] <=> b[ :priority ] }
         end
 
-        setILine "Diakonos #{VERSION} (#{LAST_MODIFIED})   F1 for help  F12 to configure"
+        setILine "Diakonos #{VERSION} (#{LAST_MODIFIED})   F1 for help  F12 to configure   Ctrl-Q to quit"
         
         num_opened = 0
         if @files.length == 0 and @read_only_files.length == 0
@@ -770,7 +795,6 @@ class Diakonos
         
             if context.empty?
                 if c > 31 and c < 255 and c != BACKSPACE
-                    debugLog "char: #{c}"
                     if @macro_history != nil
                         @macro_history.push "typeCharacter #{c}"
                     end
@@ -837,7 +861,6 @@ class Diakonos
         clip_filename = @diakonos_home + "/clips.txt"
         File.open( clip_filename, "w" ) do |f|
             @clipboard.each do |clip|
-                log clip
                 f.puts clip
                 f.puts "---------------------------"
             end
@@ -1053,7 +1076,7 @@ class Diakonos
                 f.puts
                 f.puts "----------------------------------------------------"
                 f.puts "If you can reproduce this error, please report it at"
-                f.puts "http://rome.purepistos.net/issues/diakonos/newticket !"
+                f.puts "http://linis.purepistos.net/ticket/list/Diakonos !"
                 f.puts "----------------------------------------------------"
                 f.puts e.backtrace
             end
@@ -1329,6 +1352,34 @@ class Diakonos
     
     def closeListBuffer
         closeFile( @list_buffer )
+        @list_buffer = nil
+    end
+    def showing_list?
+      @list_buffer
+    end
+    def current_list_item
+      if @list_buffer
+        @list_buffer.select_current_line
+      end
+    end
+    def select_list_item
+      if @list_buffer
+        line = @list_buffer.select_current_line
+        @list_buffer.display
+        line
+      end
+    end
+    def previous_list_item
+      if @list_buffer
+        cursorUp
+        @list_buffer[ @list_buffer.currentRow ]
+      end
+    end
+    def next_list_item
+      if @list_buffer
+        cursorDown
+        @list_buffer[ @list_buffer.currentRow ]
+      end
     end
     
     def runHookProcs( hook_id, *args )
@@ -1396,6 +1447,10 @@ class Diakonos
     def clearMatches
         @current_buffer.clearMatches Buffer::DO_DISPLAY
     end
+    
+    def close_code
+        @current_buffer.close_code
+    end
 
     # Returns the choice the user made, or nil if the user was not prompted to choose.
     def closeFile( buffer = @current_buffer, to_all = nil )
@@ -1806,11 +1861,11 @@ class Diakonos
             else
                 end_row = mark.end_row - 1
             end
-            (mark.start_row...end_row).each do |row|
+            (mark.start_row..end_row).each do |row|
                 @current_buffer.indent row, Buffer::DONT_DISPLAY
             end
             @do_display = true
-            @current_buffer.indent( end_row ) 
+            @current_buffer.display
         else
             @current_buffer.indent
         end
@@ -1827,7 +1882,23 @@ class Diakonos
     def insertTab
         typeCharacter( TAB )
     end
+    
+    def joinLines
+        @current_buffer.joinLines( @current_buffer.currentRow, Buffer::STRIP_LINE )
+    end
 
+    def list_buffers
+      File.open( @list_filename, "w" ) do |f|
+        f.puts @buffers.keys.map { |name| "#{name}\n" }.sort
+      end
+      openListBuffer
+      filename = getUserInput( "Switch to buffer: " )
+      buffer = @buffers[ filename ]
+      if buffer
+        switchTo buffer
+      end
+    end
+    
     def loadScript( name_ = nil )
         if name_ == nil
             name = getUserInput( "File to load as script: ", @rlh_files )
@@ -2013,11 +2084,11 @@ class Diakonos
         if( @current_buffer.changing_selection )
             @do_display = false
             mark = @current_buffer.selection_mark
-            (mark.start_row...mark.end_row).each do |row|
+            (mark.start_row..mark.end_row).each do |row|
                 @current_buffer.parsedIndent row, Buffer::DONT_DISPLAY
             end
             @do_display = true
-            @current_buffer.parsedIndent mark.end_row
+            @current_buffer.display
         else
             @current_buffer.parsedIndent
         end
@@ -2151,6 +2222,16 @@ class Diakonos
             #end
         end
     end
+    
+    def select_block( beginning = nil, ending = nil, including_ending = true )
+      if beginning.nil?
+        beginning = Regexp.new( getUserInput( "Start at regexp: " ) )
+      end
+      if ending.nil?
+        ending = Regexp.new( getUserInput( "End before regexp: " ) )
+      end
+      @current_buffer.select( beginning, ending, including_ending )
+    end
 
     def scrollDown
         @current_buffer.pitchView( @settings[ "view.scroll_amount" ] || 1 )
@@ -2374,11 +2455,11 @@ class Diakonos
             else
                 end_row = mark.end_row - 1
             end
-            (mark.start_row...end_row).each do |row|
+            (mark.start_row..end_row).each do |row|
                 @current_buffer.unindent row, Buffer::DONT_DISPLAY
             end
             @do_display = true
-            @current_buffer.unindent( end_row ) 
+            @current_buffer.display
         else
             @current_buffer.unindent
         end

data/lib/diakonos/array.rb

@@ -2,7 +2,12 @@ class Array
     def to_keychain_s
         chain_str = ""
         each do |key|
-            chain_str << key.keyString + " "
+            key_str = key.keyString
+            if key_str
+                chain_str << key_str + " "
+            else
+                chain_str << key.to_s + " "
+            end
         end
         return chain_str
     end

data/lib/diakonos/buffer.rb

@@ -25,6 +25,8 @@ class Buffer
     DONT_PITCH_CURSOR = false
     CLEAR_STACK_POINTER = true
     DONT_CLEAR_STACK_POINTER = false
+    STRIP_LINE = true
+    DONT_STRIP_LINE = false
 
     # Set name to nil to create a buffer that is not associated with a file.
     def initialize( diakonos, name, read_only = false )
@@ -121,6 +123,7 @@ class Buffer
         @indenters = @diakonos.indenters[ @language ]
         @unindenters = @diakonos.unindenters[ @language ]
         @preventers = @settings[ "lang.#{@language}.indent.preventers" ]
+        @closers = @diakonos.closers[ @language ] || Hash.new
         @auto_indent = @settings[ "lang.#{@language}.indent.auto" ]
         @indent_size = ( @settings[ "lang.#{@language}.indent.size" ] or 4 )
         @indent_roundup = ( @settings[ "lang.#{@language}.indent.roundup" ] or true )
@@ -209,7 +212,7 @@ class Buffer
                             linestr[ 0 ] = ( @settings[ "view.nonfilelines.character" ] or "~" )
                         end
                         
-                        @win_main.addstr_ linestr
+                        @win_main.addstr linestr
                     end
                     
                     @win_main.setpos( @last_screen_y , @last_screen_x )
@@ -221,9 +224,9 @@ class Buffer
                     
                     Curses::curs_set 1
                 rescue Exception => e
-                    $diakonos.log( "Display Exception:" )
-                    $diakonos.log( e.message )
-                    $diakonos.log( e.backtrace.join( "\n" ) )
+                    @diakonos.log( "Display Exception:" )
+                    @diakonos.log( e.message )
+                    @diakonos.log( e.backtrace.join( "\n" ) )
                     showException e
                 end
                 @diakonos.display_mutex.unlock
@@ -343,6 +346,45 @@ class Buffer
     def selection_mark
         return @text_marks[ SELECTION ]
     end
+    
+    def select_current_line
+      @text_marks[ SELECTION ] = TextMark.new(
+        @last_row,
+        0,
+        @last_row,
+        @lines[ @last_row ].size,
+        @selection_formatting
+      )
+      @lines[ @last_row ]
+    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
+          break
+        end
+      end
+      if start_row
+        end_row = nil
+        @lines[ start_row..-1 ].each_with_index do |line,index|
+          if line =~ to_regexp
+            end_row = start_row + index
+            break
+          end
+        end
+        if end_row
+          if include_ending
+            end_row += 1
+          end
+          anchorSelection( start_row, 0, DONT_DISPLAY )
+          cursorTo( end_row, 0 )
+          display
+        end
+      end
+    end
 
     # Prints text to the screen, truncating where necessary.
     # Returns nil if the string is completely off-screen.
@@ -392,7 +434,7 @@ class Buffer
                 @win_main.attrset text_mark.formatting
                 if ( (text_mark.start_row + 1) .. (text_mark.end_row - 1) ) === row
                     @win_main.setpos( cury, curx )
-                    @win_main.addstr_ string
+                    @win_main.addstr string
                 elsif row == text_mark.start_row and row == text_mark.end_row
                     expanded_col = tabExpandedColumn( text_mark.start_col, row )
                     if expanded_col < @left_column + Curses::cols
@@ -400,7 +442,7 @@ class Buffer
                         right = tabExpandedColumn( text_mark.end_col, row ) - @left_column
                         if left < right
                             @win_main.setpos( cury, curx + left )
-                            @win_main.addstr_ string[ left...right ]
+                            @win_main.addstr string[ left...right ]
                         end
                     end
                 elsif row == text_mark.start_row
@@ -408,12 +450,12 @@ class Buffer
                     if expanded_col < @left_column + Curses::cols
                         left = [ expanded_col - @left_column, 0 ].max
                         @win_main.setpos( cury, curx + left )
-                        @win_main.addstr_ string[ left..-1 ]
+                        @win_main.addstr string[ left..-1 ]
                     end
                 elsif row == text_mark.end_row
                     right = tabExpandedColumn( text_mark.end_col, row ) - @left_column
                     @win_main.setpos( cury, curx )
-                    @win_main.addstr_ string[ 0...right ]
+                    @win_main.addstr string[ 0...right ]
                 else
                     # This row not in selection.
                 end
@@ -426,7 +468,7 @@ class Buffer
         return if string == nil
 
         @win_main.attrset formatting
-        @win_main.addstr_ string
+        @win_main.addstr string
     end
 
     # This method assumes that the cursor has been setup already at
@@ -644,10 +686,8 @@ class Buffer
                 if col == line.length
                     if row < @lines.length - 1
                         # Delete newline, and concat next line
-                        takeSnapshot( TYPING )
-                        @lines[ row ] << @lines.delete_at( row + 1 )
+                        joinLines( row )
                         cursorTo( @last_row, @last_col )
-                        setModified
                     end
                 else
                     takeSnapshot( TYPING )
@@ -658,6 +698,29 @@ class Buffer
         end
     end
     
+    def joinLines( row = @last_row, strip = DONT_STRIP_LINE )
+        takeSnapshot( TYPING )
+        next_line = @lines.delete_at( row + 1 )
+        if strip
+            next_line = ' ' + next_line.strip
+        end
+        @lines[ row ] << next_line
+        setModified
+    end
+    
+    def close_code
+        line = @lines[ @last_row ]
+        @closers.each_value do |h|
+            h[ :regexp ] =~ line
+            lm = Regexp.last_match
+            if lm
+                insertString h[ :closer ].call( lm ).to_s
+            else
+                @diakonos.log h[ :regexp ].inspect + " does not match '#{line}'"
+            end
+        end
+    end
+    
     def collapseWhitespace
         removeSelection( DONT_DISPLAY ) if selection_mark != nil
         
@@ -698,12 +761,19 @@ class Buffer
 
         row = @last_row
         col = @last_col
+        
         takeSnapshot
-        retval = [ @lines[ row ][ col..-1 ] ]
-        @lines[ row ] = @lines[ row ][ 0...col ]
+        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        
+          retval = [ @lines[ row ][ col..-1 ] ]
+          @lines[ row ] = @lines[ row ][ 0...col ]
+        end
         setModified
 
-        return retval
+        retval
     end
 
     def carriageReturn
@@ -1374,7 +1444,7 @@ class Buffer
             if replacement != nil
                 choice = @diakonos.getChoice(
                     "Replace?",
-                    [ CHOICE_YES, CHOICE_NO, CHOICE_ALL, CHOICE_CANCEL ],
+                    [ CHOICE_YES, CHOICE_NO, CHOICE_ALL, CHOICE_CANCEL, CHOICE_YES_AND_STOP ],
                     CHOICE_YES
                 )
                 case choice
@@ -1387,6 +1457,9 @@ class Buffer
                         find( regexps, direction, replacement )
                     when CHOICE_CANCEL
                         # Do nothing further.
+                    when CHOICE_YES_AND_STOP
+                        paste [ replacement ]
+                        # Do nothing further.
                 end
             end
         else

data/lib/diakonos/readline.rb

@@ -46,7 +46,12 @@ class Readline
                         end
                     end
                 when ENTER
+                  item = @diakonos.current_list_item
+                  if item and File.directory? item
+                    completeInput
+                  else
                     break
+                  end
                 when ESCAPE, CTRL_C, CTRL_D, CTRL_Q
                     @input = nil
                     break
@@ -70,22 +75,38 @@ class Readline
                     completeInput
                 when Curses::KEY_NPAGE
                     @diakonos.pageDown
+                    line = @diakonos.select_list_item
+                    if line
+                      @input = line
+                      cursorWriteInput
+                    end
                 when Curses::KEY_PPAGE
                     @diakonos.pageUp
-                when Curses::KEY_UP
-                    if @history_index > 0
-                        @history[ @history_index ] = @input
-                        @history_index -= 1
-                        @input = @history[ @history_index ]
-                        cursorWriteInput
+                    line = @diakonos.select_list_item
+                    if line
+                      @input = line
+                      cursorWriteInput
                     end
+                when Curses::KEY_UP
+                  if @diakonos.showing_list?
+                    @input = @diakonos.previous_list_item
+                    @diakonos.select_list_item
+                  elsif @history_index > 0
+                    @history[ @history_index ] = @input
+                    @history_index -= 1
+                    @input = @history[ @history_index ]
+                  end
+                  cursorWriteInput
                 when Curses::KEY_DOWN
-                    if @history_index < @history.length - 1
-                        @history[ @history_index ] = @input
-                        @history_index += 1
-                        @input = @history[ @history_index ]
-                        cursorWriteInput
-                    end
+                  if @diakonos.showing_list?
+                    @input = @diakonos.next_list_item
+                    @diakonos.select_list_item
+                  elsif @history_index < @history.length - 1
+                    @history[ @history_index ] = @input
+                    @history_index += 1
+                    @input = @history[ @history_index ]
+                  end
+                  cursorWriteInput
                 when CTRL_K
                     @input = ""
                     cursorWriteInput
@@ -156,7 +177,13 @@ class Readline
             File.open( @list_filename, "w" ) do |f|
                 i = nil
                 matches.each do |match|
-                    f.puts match
+                    f.print match
+                    if FileTest.directory?( match )
+                      f.print '/'
+                    else
+                      @diakonos.log "'#{match}' is not a directory"
+                    end
+                    f.puts
                     
                     if match[ 0 ] != common[ 0 ]
                         common = nil

data/lib/diakonos/string.rb

@@ -119,25 +119,26 @@ class String
     end
 
     def toColourConstant
-        retval = Curses::COLOR_WHITE
-        case downcase
-            when "black", "0"
-                retval = Curses::COLOR_BLACK
-            when "red", "1"
-                retval = Curses::COLOR_RED
-            when "green", "2"
-                retval = Curses::COLOR_GREEN
-            when "yellow", "brown", "3"
-                retval = Curses::COLOR_YELLOW
-            when "blue", "4"
-                retval = Curses::COLOR_BLUE
-            when "magenta", "purple", "5"
-                retval = Curses::COLOR_MAGENTA
-            when "cyan", "6"
-                retval = Curses::COLOR_CYAN
-            when "white", "7"
-                retval = Curses::COLOR_WHITE
-        end
+      case downcase
+        when "black", "0"
+          Curses::COLOR_BLACK
+        when "red", "1"
+          Curses::COLOR_RED
+        when "green", "2"
+          Curses::COLOR_GREEN
+        when "yellow", "brown", "3"
+          Curses::COLOR_YELLOW
+        when "blue", "4"
+          Curses::COLOR_BLUE
+        when "magenta", "purple", "5"
+          Curses::COLOR_MAGENTA
+        when "cyan", "6"
+          Curses::COLOR_CYAN
+        when "white", "7"
+          Curses::COLOR_WHITE
+        else
+          to_i
+      end
     end
     
     def toDirection( default = :down )

metadata

@@ -1,33 +1,27 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: diakonos
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
-date: 2007-02-22 00:00:00 -05:00
-summary: A usable console-based text editor.
-require_paths: 
-- lib
-email: pistos at purepistos dot net
-homepage: http://purepistos.net/diakonos
-rubyforge_project: diakonos
-description: Diakonos is a customizable, usable console-based text editor.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
+  version: 0.8.4
+platform: ""
 authors: 
 - Pistos
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-05-26 00:00:00 -04:00
+default_executable: 
+dependencies: []
+
+description: Diakonos is a customizable, usable console-based text editor.
+email: pistos at purepistos dot net
+executables: 
+- diakonos
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGELOG
 files: 
 - CHANGELOG
 - README
@@ -35,43 +29,56 @@ files:
 - diakonos.conf
 - bin/diakonos
 - lib/diakonos.rb
-- lib/diakonos/finding.rb
-- lib/diakonos/ctag.rb
-- lib/diakonos/array.rb
-- lib/diakonos/enumerable.rb
 - lib/diakonos/bignum.rb
-- lib/diakonos/readline.rb
-- lib/diakonos/keycode.rb
-- lib/diakonos/hash.rb
-- lib/diakonos/sized-array.rb
-- lib/diakonos/regexp.rb
+- lib/diakonos/bookmark.rb
 - lib/diakonos/buffer-hash.rb
 - lib/diakonos/clipboard.rb
-- lib/diakonos/bookmark.rb
-- lib/diakonos/object.rb
+- lib/diakonos/ctag.rb
+- lib/diakonos/enumerable.rb
+- lib/diakonos/finding.rb
 - lib/diakonos/fixnum.rb
-- lib/diakonos/string.rb
+- lib/diakonos/hash.rb
+- lib/diakonos/keycode.rb
+- lib/diakonos/object.rb
+- lib/diakonos/regexp.rb
+- lib/diakonos/sized-array.rb
+- lib/diakonos/text-mark.rb
 - lib/diakonos/window.rb
+- lib/diakonos/array.rb
+- lib/diakonos/readline.rb
 - lib/diakonos/buffer.rb
-- lib/diakonos/text-mark.rb
-test_files: 
-- test/hash-test.rb
-- test/string-test.rb
-- test/diakonos-test.rb
-- test/buffer-test.rb
-- test/regexp-test.rb
-- test/sizedarray-test.rb
-- test/clipboard-test.rb
+- lib/diakonos/string.rb
+has_rdoc: false
+homepage: http://purepistos.net/diakonos
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- CHANGELOG
-executables: 
-- diakonos
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: 
 - curses library for Ruby (not in default Ruby install on Debian or FreeBSD; not sufficiently implemented on Windows)
-dependencies: []
-
+rubyforge_project: diakonos
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: A usable console-based text editor.
+test_files: 
+- test/buffer-test.rb
+- test/clipboard-test.rb
+- test/diakonos-test.rb
+- test/hash-test.rb
+- test/regexp-test.rb
+- test/sizedarray-test.rb
+- test/string-test.rb