diakonos 0.8.5 → 0.8.6

data/CHANGELOG

@@ -1,6 +1,21 @@
 Diakonos Changelog
 ------------------
 
+0.8.6
+
+- Find-as-you-type added.
+- Help system added.
+- print_mapped_function added.
+- User-definable status line variables added.
+- :after_open and :after_buffer_switch hooks added.
+- Sample script for git branch status variable added.
+- comment_out and uncomment functions added.
+- comment_string and comment_close_string settings added.
+- Added -m (--open-matching) command line argument.
+- wrap_paragraph function and wrap_margin setting added for hard wrapping text.
+- columnize function and column_delimiter setting added.
+- Numerous small fixes, adjustments and refactorings.
+
 0.8.5
 
 - Added 256 colour support.

data/README

@@ -61,9 +61,8 @@ or, for other options and arguments,
 
   diakonos --help 
 
-For a quick introduction, see
-
-http://wiki.purepistos.net/doku.php?id=Diakonos:Getting-Started
+For help using Diakonos, simply press F1 from within the editor to use the
+interactive help system.
 
 ----------------------------------------------------------------
 

data/diakonos-256-colour.conf

@@ -12,6 +12,14 @@ 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
 
+# Diakonos help files
+
+lang.dhf.format.default white
+lang.dhf.format.selection inverse
+lang.dhf.format.found yellow inverse
+lang.dhf.tokens.tags.format blue
+lang.dhf.tokens.title.format 33
+
 # Ruby
 
 lang.ruby.format.default white bold

data/diakonos.conf

@@ -1,3 +1,5 @@
+#suppress_welcome true
+
 logfile ~/.diakonos/diakonos.log
 
 # When the cursor is view.margin.y lines or less from the top or
@@ -66,7 +68,7 @@ use_magic_file false
 
 # Use "% syntax" as placeholders
 # e.g. %d for decimal integers, %s for strings
-status.left -- %s %s%s%s -- (%s) -
+status.left -- %s %s%s%s -- (%s) --%s
 status.right - Buf %d of %d --- L%3d/%3d C%2d --
 # The string to use to fill in the space between the left and right sides
 # of the status line.
@@ -77,7 +79,7 @@ status.unnamed_str (unnamed file)
 status.read_only_str (read-only)
 # status.vars: any subset of:
 # line row num_lines col filename modified type buffer_number num_buffers selecting read_only
-status.vars filename modified read_only selecting type buffer_number num_buffers row num_lines col
+status.vars filename modified read_only selecting type @git_branch buffer_number num_buffers row num_lines col
 status.format inverse
 
 # ---------------------------------------------------------------------
@@ -145,7 +147,7 @@ key esc [ 4 ~;cursorEOL
 key esc [ 8 ~;cursorEOL
 key pageup;pageUp
 key pagedown;pageDown
-key ctrl+a;cursorBOL
+#key ctrl+a;cursorBOL
 key ctrl+e;cursorEOL
 key alt+<;cursorBOF
 key esc [ 1 ; 5 H   cursorBOF
@@ -207,6 +209,8 @@ key ctrl+k;deleteAndStoreLine
 key ctrl+alt+k;deleteToEOL
 key esc del;collapseWhitespace
 key esc [ 3 ; 3 ~    collapseWhitespace
+key alt+w            wrap_paragraph
+key alt+a            columnize
 key enter;carriageReturn
 key tab;parsedIndent
 #key tab;indent
@@ -264,6 +268,7 @@ key ctrl+space;anchorSelection
 key ctrl+c;copySelection
 key ctrl+x;cutSelection
 key alt+u;removeSelection
+key ctrl+a    select_all
 
 # If you are using KDE, you can uncomment these lines to synchronize
 # the Diakonos clipboard with the KDE clipboard
@@ -278,6 +283,8 @@ key ctrl+b         select_block
 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 esc #          comment_out
+key esc @          uncomment
 
 key ctrl+alt+v;showClips
 key ctrl+v;paste
@@ -300,7 +307,8 @@ key esc [ 1 3 ~;findAgain "down"
 key f15;findAgain "up"
 key esc [ 2 8 ~   findAgain "up"
 key esc O 2 R;findAgain "up"
-key ctrl+r;searchAndReplace
+key ctrl+r   searchAndReplace
+key alt+r    searchAndReplace CASE_SENSITIVE
 key ctrl+alt+u;clearMatches
 key alt+c;close_code
 
@@ -310,13 +318,14 @@ key esc [ 1 2 ~   shell
 key esc [ [ B     shell
 key f8;execute
 key esc F;execute "glark '$i' $F | less"
-key esc d         shell "diff -U 5 -w -b $c $s"
+key esc d         shell "diff -U 5 -w -b $c $s", "clipboard.diff"
 #key esc F;shell "grep -n '$i' $F"
 #key esc F;execute "grep -n '$i' $F | less"
-key f14         evaluate
-key esc O 2 Q   evaluate
-esc [ 2 6 ~     evaluate
-key ctrl+alt+c;shell "ruby -c $f"
+#key esc l         execute "aspell check $f"
+key f14           evaluate
+key esc O 2 Q     evaluate
+key esc [ 2 6 ~   evaluate
+key ctrl+alt+c    shell "ruby -c $f"
 
 # To use the following:
 # 1) Copy to the clipboard some Ruby code which operates on stdin text and outputs to stdout.
@@ -330,6 +339,7 @@ key ctrl+alt+p;pasteShellResult "cat $s | ruby $c"
 #key ctrl+alt+p;pasteShellResult "cat $s | awk -f $c"
 
 key alt+k        printKeychain
+key esc K        print_mapped_function
 key alt+m;toggleMacroRecording
 key f4            playMacro
 key esc O S       playMacro
@@ -407,6 +417,28 @@ lang.text.indent.auto true
 lang.text.indent.roundup false
 #lang.text.indent.using_tabs true
 lang.text.tabsize 8
+lang.text.wrap_margin 80
+
+# Diakonos help files
+
+lang.dhf.filemask \.dhf
+lang.dhf.format.default white
+lang.dhf.format.selection inverse
+lang.dhf.format.found yellow inverse
+lang.dhf.tokens.tags (^Tags: .+)
+lang.dhf.tokens.tags.format blue
+lang.dhf.tokens.title (^# .*)
+lang.dhf.tokens.title.format 8 bold
+lang.dhf.tokens.subtitle (^## .*)
+lang.dhf.tokens.subtitle.format cyan bold
+lang.dhf.tokens.subsubtitle (^### .*)
+lang.dhf.tokens.subsubtitle.format cyan
+lang.dhf.tokens.keys <(.+?)>
+lang.dhf.tokens.keys.format white bold
+lang.dhf.indent.size 2
+lang.dhf.indent.auto true
+lang.dhf.indent.roundup true
+lang.dhf.wrap_margin 80
 
 # XML
 
@@ -429,6 +461,8 @@ lang.xml.tokens.comments.open (<!--)
 lang.xml.tokens.comments.close (-->)
 lang.xml.tokens.comments.format 8
 lang.xml.tokens.comments.change_to xml_comment
+lang.xml.comment_string <!-- 
+lang.xml.comment_close_string " -->"
 lang.xml.tokens.template.open \[@--
 lang.xml.tokens.template.close --@\]
 lang.xml.tokens.template.format brown
@@ -495,6 +529,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.comment_string <!-- 
+lang.html.comment_close_string " -->"
 lang.html.closers.tag.regexp <([^/> ]*)
 lang.html.closers.tag.closer { |m| "</" + m[ 1 ] + ">" }
 lang.html_tag.format.default white bold
@@ -547,6 +583,8 @@ lang.css.tokens.colours.format yellow bold
 lang.css.tokens.long_comments.open \/\*
 lang.css.tokens.long_comments.close \*\/
 lang.css.tokens.long_comments.format 8 bold
+lang.css.comment_string /* 
+lang.css.comment_close_string " */"
 lang.css.tokens.numbers \b([0-9]+\.[0-9]+|[0-9]+)
 lang.css.tokens.numbers.format blue bold
 lang.css.tokens.units [^A-Za-z](em|pt|px)\b
@@ -555,6 +593,7 @@ lang.css.tokens.html_elements.case_insensitive \b(A|ABBR|ACRONYM|ADDRES|APPLET|A
 lang.css.tokens.html_elements.format green
 lang.css.tokens.values \b(auto|block|inherit|inline|larger|none|smaller|solid)\b
 lang.css.tokens.values.format blue bold
+lang.css.column_delimiters :|,
 
 # Ruby
 
@@ -575,6 +614,7 @@ 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.comment_string # 
 lang.ruby.tokens.regular_expressions (\/.+?[^\\]\/)
 lang.ruby.tokens.regular_expressions.format red bold
 lang.ruby.tokens.regular_expressions2 (%r\{.+?[^\}]\})
@@ -617,11 +657,12 @@ lang.ruby.indent.auto true
 lang.ruby.indent.roundup true
 #lang.ruby.indent.using_tabs true
 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.indenters ^\s*(case|def|begin|ensure|when|else|ensure|for|while|until|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)$
+lang.ruby.column_delimiters =>?|:|,
 
 # PHP
 
@@ -640,6 +681,7 @@ lang.php.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
 lang.php.tokens.constants.format yellow bold
 lang.php.tokens.comments (\/\/.*)
 lang.php.tokens.comments.format 8 bold
+lang.php.comment_string // 
 lang.php.tokens.preprocessor (^\s*#.*)
 lang.php.tokens.preprocessor.format yellow bold
 lang.php.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -674,6 +716,7 @@ lang.perl.format.selection inverse
 lang.perl.format.found yellow inverse
 lang.perl.tokens.comments (#.*)
 lang.perl.tokens.comments.format 8 bold
+lang.perl.comment_string # 
 lang.perl.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
 lang.perl.tokens.constants.format yellow bold
 lang.perl.tokens.non_alphanum [!#^&*()\[\]{}/?=+\-\\|,<.>;:~]
@@ -705,6 +748,7 @@ lang.perl.indent.unindenters (case|^\s+[\]})])
 lang.perl.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(`.+?[^\\]`)|(\/.+?[^\\]\/)|(^\s*#.*)
 lang.perl.indent.ignore ^\s*$
 lang.perl.context.ignore ^(.+:|\s*\{?)$
+lang.perl.column_delimiters =>?|:|,
 
 # Python
 
@@ -719,6 +763,7 @@ 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.comment_string # 
 lang.python.tokens.doublequoted_strings (\".*?[^\\]\")
 lang.python.tokens.doublequoted_strings.format green bold
 lang.python.tokens.singlequoted_strings ('.*?[^\\]')
@@ -753,6 +798,7 @@ 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.comment_string // 
 lang.java.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
 lang.java.tokens.non_alphanum.format white
 lang.java.tokens.long_comments.open \/\*
@@ -771,6 +817,7 @@ 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}" }
+lang.java.column_delimiters =|:|,
 
 # C
 
@@ -788,6 +835,7 @@ lang.c.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
 lang.c.tokens.constants.format yellow bold
 lang.c.tokens.comments (\/\/.*)
 lang.c.tokens.comments.format 8 bold
+lang.c.comment_string // 
 lang.c.tokens.preprocessor (^\s*#.*)
 lang.c.tokens.preprocessor.format yellow bold
 lang.c.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -815,6 +863,7 @@ lang.conf.tokens.commands ^\s*([^\s=]+)
 lang.conf.tokens.commands.format cyan bold
 lang.conf.tokens.comments (^\s*#.*)
 lang.conf.tokens.comments.format yellow bold
+lang.conf.comment_string # 
 lang.conf.tokens.doublequoted_strings (\".*?[^\\]\")
 lang.conf.tokens.doublequoted_strings.format green bold
 lang.conf.tokens.singlequoted_strings ('.*?[^\\]')
@@ -832,6 +881,7 @@ lang.crontab.format.selection inverse
 lang.crontab.format.found yellow inverse
 lang.crontab.tokens.comments (^\s*#.*)
 lang.crontab.tokens.comments.format yellow bold
+lang.crontab.comment_string # 
 lang.crontab.tokens.schedule ^((?:[0-9\/*,-]+\s+){5})
 lang.crontab.tokens.schedule.format cyan bold
 lang.crontab.tokens.commands ^(\S+=.+)
@@ -847,6 +897,7 @@ lang.fstab.format.selection inverse
 lang.fstab.format.found yellow inverse
 lang.fstab.tokens.comments (^\s*#.*)
 lang.fstab.tokens.comments.format yellow bold
+lang.fstab.comment_string # 
 lang.fstab.indent.size 4
 lang.fstab.indent.auto true
 lang.fstab.indent.roundup true
@@ -862,7 +913,8 @@ lang.sql.indent.size 4
 lang.sql.indent.auto true
 lang.sql.indent.roundup true
 #lang.sql.indent.using_tabs true
-lang.sql.tokens.reserved_words.case_insensitive \b(ABSOLUTE|ACCESS|ACTION|ADD|ADMIN|AFTER|ALIAS|ALL|ALLOCATE|AND|ANY|ARE|AS|ASC|ASSERTION|AT|AUDIT|AUTHORIZATION|AVG|BEFORE|BEGIN|BETWEEN|BIT_LENGTH|BOTH|BREADTH|BY|CASCADE|CASCADED|CASE|CAST|CATALOG|CHAR_LENGTH|CHARACTER_LENGTH|CHECK|CLASS|CLOSE|CLUSTER|COALESCE|COBOL|COLLATE|COLLATION|COLUMN|COMPLETION|COMPRESS|COMPUTED|CONCAT|CONNECT|CONNECTION|CONSTRAINT|CONSTRAINTS|CONSTRUCTOR|CONTINUE|CONVERT|CORRESPONDING|COUNT|CROSS|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURRENT|CURSOR|CYCLE|DATA|DAY|DBHIGH|DBKEY|DBLOW|DBMAC|DEALLOCATE|DECLARE|DECODE|DEFAULT|DEFERRABLE|DEFERRED|DEPTH|DEREF|DESC|DESCRIBE|DESCRIPTOR|DESTROY|DESTRUCTOR|DIAGNOSTICS|DICTIONARY|DISCONNECT|DISTINCT|DO|DOMAIN|EACH|ELEMENT|ELSE|ELSEIF|END-EXEC|END|EQUALS|ESCAPE|EXCEPT|EXCEPTION|EXCEPTIONS|EXCLUSIVE|EXISTS|EXTERNAL|EXTERNALLY|EXTRACT|FALSE|FILE|FIRST|FOR|FOREIGN|FORTRAN|FOUND|FROM|FULL|FUNCTION|GENERAL|GET|GLOBAL|GO|GOTO|GROUP|HAVING|HOUR|IDENTIFIED|IDENTITY|IF|IGNORE|IMMEDIATE|IN|INCREMENT|INDEX|INDICATOR|INITIAL|INITIALLY|INNER|INOUT|INPUT|INSENSITIVE|INSTEAD|INTERSECT|INTERVAL|INTO|IS|ISOLATION|JOIN|KEY|LABEL|LANGUAGE|LAST|LEADING|LEAVE|LEFT|LESS|LEVEL|LIKE|LIMIT|LOCAL|LOCK|LOOP|LOWER|MATCH|MAX|MAXEXTENTS|MIN|MINUS|MINUTE|MLSLABEL|MLS_LABEL_FORMAT|MODE|MODIFY|MODULE|MONTH|MOVE|MULTISET|NAMES|NATIONAL|NATURAL|NEW_TABLE|NEXT|NO|NOAUDIT|NOCOMPRESS|NONE|NOT|NOWAIT|NULL|NULLIF|NUMBER|NVL|OCTET_LENGTH|OF|OFF|OFFLINE|OID|OLD|OLD_TABLE|ON|ONLINE|ONLY|OPEN|OPERATION|OPERATORS|OPTION|OR|ORDER|OTHERS|OUT|OUTER|OUTPUT|OVERLAPS|PAD|PARAMETER|PARTIAL|PASCAL|PCTFREE|PENDANT|PLI|POSITION|PRECISION|PREORDER|PRESERVE|PRIMARY|PRIOR|PRIVATE|PRIVILEGES|PROCEDURE|PROTECTED|PUBLIC|RAW|READ|READUP|REAL|RECORD|RECURSIVE|REF|REFERENCES|REFERENCING|RELATIVE|RENAME|REPLACE|REPRESENTATION|RESIGNAL|RESOURCE|RESTRICT|RETURN|RETURNS|RIGHT|ROLE|ROUTINE|ROW|ROWID|ROWNUM|ROWS|SAVEPOINT|SCHEMA|SCROLL|SEARCH|SECOND|SECTION|SENSITIVE|SEQUENCE|SESSION|SESSION_USER|SET|SHARE|SIGNAL|SIMILAR|SIZE|SOME|SPACE|SPECIFIC|SQL|SQLCODE|SQLERROR|SQLEXCEPTION|SQLSTATE|SQLWARNING|START|STRUCTURE|SUBSTRING|SUCCESSFUL|SUM|SYNONYM|SYSDATE|SYSTEM_USER|TABLE|TEMPLATE|TEMPORARY|TEST|THAN|THEN|THERE|SQ92|TIMEZONE_HOUR|TIMEZONE_MINUTE|TO|TRAILING|TRANSACTION|TRANSLATE|TRANSLATION|TRIGGER|TRIM|TRUE|TUPLE|TYPE|UID|UNDER|UNION|UNIQUE|UNKNOWN|UPPER|USAGE|USER|USING|VALIDATE|VALUE|VALUES|VARIABLE|VARIANT|VIRTUAL|VARYING|VIEW|VISIBLE|VOID|WAIT|WHEN|WHENEVER|WHERE|WHILE|WITH|WITHOUT|WORK|WRITE|WRITEDOWN|WRITEUP|YEAR|ZONE)\b
+#lang.sql.tokens.reserved_words.case_insensitive \b(ABSOLUTE|ACCESS|ACTION|ADD|ADMIN|AFTER|ALIAS|ALL|ALLOCATE|AND|ANY|ARE|AS|ASC|ASSERTION|AT|AUDIT|AUTHORIZATION|AVG|BEFORE|BEGIN|BETWEEN|BIT_LENGTH|BOTH|BREADTH|BY|CASCADE|CASCADED|CASE|CAST|CATALOG|CHAR_LENGTH|CHARACTER_LENGTH|CHECK|CLASS|CLOSE|CLUSTER|COALESCE|COBOL|COLLATE|COLLATION|COLUMN|COMPLETION|COMPRESS|COMPUTED|CONCAT|CONNECT|CONNECTION|CONSTRAINT|CONSTRAINTS|CONSTRUCTOR|CONTINUE|CONVERT|CORRESPONDING|COUNT|CROSS|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURRENT|CURSOR|CYCLE|DATA|DAY|DBHIGH|DBKEY|DBLOW|DBMAC|DEALLOCATE|DECLARE|DECODE|DEFAULT|DEFERRABLE|DEFERRED|DEPTH|DEREF|DESC|DESCRIBE|DESCRIPTOR|DESTROY|DESTRUCTOR|DIAGNOSTICS|DICTIONARY|DISCONNECT|DISTINCT|DO|DOMAIN|EACH|ELEMENT|ELSE|ELSEIF|END-EXEC|END|EQUALS|ESCAPE|EXCEPT|EXCEPTION|EXCEPTIONS|EXCLUSIVE|EXISTS|EXTERNAL|EXTERNALLY|EXTRACT|FALSE|FILE|FIRST|FOR|FOREIGN|FORTRAN|FOUND|FROM|FULL|FUNCTION|GENERAL|GET|GLOBAL|GO|GOTO|GROUP|HAVING|HOUR|IDENTIFIED|IDENTITY|IF|IGNORE|IMMEDIATE|IN|INCREMENT|INDEX|INDICATOR|INITIAL|INITIALLY|INNER|INOUT|INPUT|INSENSITIVE|INSTEAD|INTERSECT|INTERVAL|INTO|IS|ISOLATION|JOIN|KEY|LABEL|LANGUAGE|LAST|LEADING|LEAVE|LEFT|LESS|LEVEL|LIKE|LIMIT|LOCAL|LOCK|LOOP|LOWER|MATCH|MAX|MAXEXTENTS|MIN|MINUS|MINUTE|MLSLABEL|MLS_LABEL_FORMAT|MODE|MODIFY|MODULE|MONTH|MOVE|MULTISET|NAMES|NATIONAL|NATURAL|NEW_TABLE|NEXT|NO|NOAUDIT|NOCOMPRESS|NONE|NOT|NOWAIT|NULL|NULLIF|NUMBER|NVL|OCTET_LENGTH|OF|OFF|OFFLINE|OID|OLD|OLD_TABLE|ON|ONLINE|ONLY|OPEN|OPERATION|OPERATORS|OPTION|OR|ORDER|OTHERS|OUT|OUTER|OUTPUT|OVERLAPS|PAD|PARAMETER|PARTIAL|PASCAL|PCTFREE|PENDANT|PLI|POSITION|PRECISION|PREORDER|PRESERVE|PRIMARY|PRIOR|PRIVATE|PRIVILEGES|PROCEDURE|PROTECTED|PUBLIC|RAW|READ|READUP|REAL|RECORD|RECURSIVE|REF|REFERENCES|REFERENCING|RELATIVE|RENAME|REPLACE|REPRESENTATION|RESIGNAL|RESOURCE|RESTRICT|RETURN|RETURNS|RIGHT|ROLE|ROUTINE|ROW|ROWID|ROWNUM|ROWS|SAVEPOINT|SCHEMA|SCROLL|SEARCH|SECOND|SECTION|SENSITIVE|SEQUENCE|SESSION|SESSION_USER|SET|SHARE|SIGNAL|SIMILAR|SIZE|SOME|SPACE|SPECIFIC|SQL|SQLCODE|SQLERROR|SQLEXCEPTION|SQLSTATE|SQLWARNING|START|STRUCTURE|SUBSTRING|SUCCESSFUL|SUM|SYNONYM|SYSDATE|SYSTEM_USER|TABLE|TEMPLATE|TEMPORARY|TEST|THAN|THEN|THERE|SQ92|TIMEZONE_HOUR|TIMEZONE_MINUTE|TO|TRAILING|TRANSACTION|TRANSLATE|TRANSLATION|TRIGGER|TRIM|TRUE|TUPLE|TYPE|UID|UNDER|UNION|UNIQUE|UNKNOWN|UPPER|USAGE|USER|USING|VALIDATE|VALUE|VALUES|VARIABLE|VARIANT|VIRTUAL|VARYING|VIEW|VISIBLE|VOID|WAIT|WHEN|WHENEVER|WHERE|WHILE|WITH|WITHOUT|WORK|WRITE|WRITEDOWN|WRITEUP|YEAR|ZONE)\b
+lang.sql.tokens.reserved_words.case_insensitive \b(ALL|AND|ANY|AS|ASC|BEGIN|BY|CASCADE|CASE|CAST|CHECK|COALESCE|COLUMN|CONSTRAINT|COUNT|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURSOR|DECLARE|DEFAULT|DESC|DISTINCT|DO|ELSE|ELSEIF|END|EXCEPT|EXISTS|FALSE|FIRST|FOR|FOREIGN|FOUND|FROM|FULL|FUNCTION|GROUP|HAVING|HOUR|IF|IN|INCREMENT|INDEX|INNER|INPUT|INSTEAD|INTERSECT|INTERVAL|INTO|IS|JOIN|KEY|LANGUAGE|LAST|LEFT|LIKE|LIMIT|LOOP|MAX|MIN|NATURAL|NEXT|NO|NONE|NOT|NULL|NUMBER|OF|OFF|OLD|ON|ONLY|OR|ORDER|OUT|OUTER|PARTIAL|PRECISION|PRIMARY|REAL|RECORD|REF|REFERENCES|REPLACE|RESTRICT|RETURN|RETURNS|RIGHT|SCHEMA|SEQUENCE|SET|SUM|TABLE|TEMPORARY|THAN|THEN|TO|TRANSACTION|TRIGGER|TRUE|TYPE|UNION|UNIQUE|UPPER|USING|VALUE|VALUES|VARYING|VIEW|WHEN|WHERE|WHILE|WITH|WITHOUT|WORK)\b
 lang.sql.tokens.reserved_words.format white
 lang.sql.tokens.commands.case_insensitive \b(ALTER|COMMENT|COMMIT|CREATE|DELETE|DROP|EXEC|EXECUTE|FETCH|GRANT|INSERT|PERFORM|PREPARE|REVOKE|ROLLBACK|SELECT|UPDATE)\b
 lang.sql.tokens.commands.format cyan
@@ -870,6 +922,7 @@ lang.sql.tokens.data_types.case_insensitive \b(BIT|BOOLEAN|CHAR|CHARACTER|DATE|D
 lang.sql.tokens.data_types.format brown
 lang.sql.tokens.comments (--.*)
 lang.sql.tokens.comments.format 8 bold
+lang.sql.comment_string -- 
 lang.sql.tokens.singlequoted_strings ('.*?[^\\]')
 lang.sql.tokens.singlequoted_strings.format green bold
 lang.sql.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -895,6 +948,7 @@ lang.bash.indent.roundup true
 lang.bash.tabsize 4
 lang.bash.tokens.comments (^\s*#.*)
 lang.bash.tokens.comments.format 8 bold
+lang.bash.comment_string # 
 lang.bash.tokens.singlequoted_strings ('.*?[^\\]')
 lang.bash.tokens.singlequoted_strings.format green bold
 lang.bash.tokens.doublequoted_strings (\".*?[^\\]\")
@@ -920,6 +974,7 @@ lang.tcl.indent.roundup true
 lang.tcl.tabsize 4
 lang.tcl.tokens.comments (^\s*#.*)
 lang.tcl.tokens.comments.format 8 bold
+lang.tcl.comment_string # 
 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.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
@@ -992,6 +1047,7 @@ lang.yaml.tokens.directive_indicator ^(%.*)
 lang.yaml.tokens.directive_indicator.format 10
 lang.yaml.tokens.comment_indicator (#.+)
 lang.yaml.tokens.comment_indicator.format 8 bold
+lang.yaml.comment_string # 
 lang.yaml.tokens.anchor_indicator (&\w+)
 lang.yaml.tokens.anchor_indicator.format red bold
 lang.yaml.tokens.alias_indicator (\*\w+)

data/lib/diakonos.rb

@@ -47,8 +47,8 @@ require 'diakonos/readline'
 
 module Diakonos
 
-    VERSION = '0.8.5'
-    LAST_MODIFIED = 'August 27, 2008'
+    VERSION = '0.8.6'
+    LAST_MODIFIED = 'October 31, 2008'
 
     DONT_ADJUST_ROW = false
     ADJUST_ROW = true
@@ -56,6 +56,8 @@ module Diakonos
     DONT_PROMPT_OVERWRITE = false
     DO_REDRAW = true
     DONT_REDRAW = false
+    QUIET = true
+    NOISY = false
 
     TAB = 9
     ENTER = 13
@@ -116,6 +118,8 @@ module Diakonos
         'closeFile',
         'close_code',
         'collapseWhitespace',
+        'columnize',
+        'comment_out',
         'copySelection',
         'copy_selection_to_klipper',
         'cursorBOF',
@@ -172,6 +176,7 @@ module Diakonos
         'paste_from_klipper',
         'playMacro',
         'popTag',
+        'print_mapped_function',
         'printKeychain',
         'quit',
         'redraw',
@@ -185,6 +190,7 @@ module Diakonos
         'scrollUp',
         'searchAndReplace',
         'seek',
+        'select_all',
         'select_block',
         'setBufferType',
         'setReadOnly',
@@ -198,9 +204,11 @@ module Diakonos
         'toggleMacroRecording',
         'toggleSelection',
         'toggleSessionSetting',
+        'uncomment',
         'undo',
         'unindent',
-        'unundo'
+        'unundo',
+        'wrap_paragraph',
     ]
     LANG_TEXT = 'text'
     
@@ -215,16 +223,17 @@ class Diakonos
 
     def initialize( argv = [] )
         @diakonos_home = ( ( ENV[ 'HOME' ] or '' ) + '/.diakonos' ).subHome
-        if not FileTest.exists? @diakonos_home
-            Dir.mkdir @diakonos_home
-        end
+        mkdir @diakonos_home
         @script_dir = "#{@diakonos_home}/scripts"
-        if not FileTest.exists? @script_dir
-            Dir.mkdir @script_dir
-        end
+        mkdir @script_dir
+        
+        init_help
+        
         @debug = File.new( "#{@diakonos_home}/debug.log", 'w' )
         @list_filename = @diakonos_home + '/listing.txt'
         @diff_filename = @diakonos_home + '/text.diff'
+        @help_filename = "#{@help_dir}/about-help.dhf"
+        @error_filename = "#{@diakonos_home}/diakonos.err"
 
         @files = Array.new
         @read_only_files = Array.new
@@ -265,46 +274,63 @@ class Diakonos
         @iterated_choice = nil
         @choice_iterations = 0
         @there_was_non_movement = false
+        @status_vars = Hash.new
         
         # Readline histories
         @rlh_general = Array.new
         @rlh_files = Array.new
         @rlh_search = Array.new
         @rlh_shell = Array.new
+        @rlh_help = Array.new
+    end
+    
+    def mkdir( dir )
+      if not FileTest.exists? dir
+        Dir.mkdir dir
+      end
     end
 
     def parseOptions( argv )
+      @post_load_script = ""
         while argv.length > 0
             arg = argv.shift
             case arg
-                when '-h', '--help'
-                    printUsage
-                    exit 1
-                when '-ro'
-                    filename = argv.shift
-                    if filename == nil
-                        printUsage
-                        exit 1
-                    else
-                        @read_only_files.push filename
-                    end
-                when '-c', '--config'
-                    @config_filename = argv.shift
-                    if @config_filename == nil
-                        printUsage
-                        exit 1
-                    end
-                when '-e', '--execute'
-                    post_load_script = argv.shift
-                    if post_load_script == nil
-                        printUsage
-                        exit 1
-                    else
-                        @post_load_script = post_load_script
-                    end                        
-                else
-                    # a name of a file to open
-                    @files.push arg
+            when '-h', '--help'
+              printUsage
+              exit 1
+            when '-ro'
+              filename = argv.shift
+              if filename == nil
+                printUsage
+                exit 1
+              else
+                @read_only_files.push filename
+              end
+            when '-c', '--config'
+              @config_filename = argv.shift
+              if @config_filename == nil
+                printUsage
+                exit 1
+              end
+            when '-e', '--execute'
+              post_load_script = argv.shift
+              if post_load_script.nil?
+                printUsage
+                exit 1
+              else
+                @post_load_script << "\n#{post_load_script}"
+              end                        
+            when '-m', '--open-matching'
+              regexp = argv.shift
+              files = `egrep -rl '#{regexp}' *`.split( /\n/ )
+              if files.any?
+                @files.concat files
+                script = "\nfind 'down', CASE_SENSITIVE, '#{regexp}'"
+                @post_load_script << script
+              end              
+            else
+              # a name of a file to open
+              @files.push arg
             end
         end
     end
@@ -313,12 +339,64 @@ class Diakonos
     def printUsage
         puts "Usage: #{$0} [options] [file] [file...]"
         puts "\t--help\tDisplay usage"
-        puts "\t-ro <file>\tLoad file as read-only"
         puts "\t-c <config file>\tLoad this config file instead of ~/.diakonos/diakonos.conf"
         puts "\t-e, --execute <Ruby code>\tExecute Ruby code (such as Diakonos commands) after startup"
+        puts "\t-m, --open-matching <regular expression>\tOpen all matching files under current directory"
+        puts "\t-ro <file>\tLoad file as read-only"
     end
     protected :printUsage
     
+    def init_help
+      @base_help_dir = "#{@diakonos_home}/help"
+      mkdir @base_help_dir
+      
+      @help_dir = "#{@diakonos_home}/help/#{VERSION}"
+      if not File.exist?( @help_dir )
+        puts "Help files for this Diakonos version were not found (#{@help_dir})."
+        
+        $stdout.puts "Would you like to download the help files right now from the Diakonos website? (y/n)"; $stdout.flush
+        answer = $stdin.gets
+        case answer
+        when /^y/i
+          if not fetch_help
+            $stderr.puts "Failed to get help for version #{VERSION}."
+          end
+        end
+        
+        if not FileTest.exists?( @help_dir ) or Dir[ "#{@help_dir}/*" ].size == 0
+          $stderr.puts "Terminating..."
+          exit 1
+        end
+      end
+      
+      @help_tags = `grep -h Tags #{@help_dir}/* | cut -d ' ' -f 2-`.split.uniq
+    end
+    
+    def fetch_help
+      require 'open-uri'
+      success = false
+      puts "Fetching help documents for version #{VERSION}..."
+      
+      filename = "diakonos-help-#{VERSION}.tar.gz"
+      uri = "http://purepistos.net/diakonos/#{filename}"
+      tarball = "#{@base_help_dir}/#{filename}"
+      begin
+        open( uri ) do |http|
+          bytes = http.read
+          File.open( tarball, 'w' ) do |f|
+            f.print bytes
+          end
+        end
+        mkdir @help_dir
+        `tar zxf #{tarball} -C #{@base_help_dir}`
+        success = true
+      rescue OpenURI::HTTPError => e
+        $stderr.puts "Failed to fetch from #{uri} ."
+      end
+      
+      success
+    end
+    
     def initializeDisplay
         if @win_main != nil
             @win_main.close
@@ -400,7 +478,7 @@ class Diakonos
         $stderr.puts "Failed to fetch from #{location}."
       end
       
-      return found
+      found
     end
     
     def loadConfiguration
@@ -515,13 +593,13 @@ class Diakonos
                         keystrokes = Array.new
                         keystrings.split( /\s+/ ).each do |ks_str|
                             code = ks_str.keyCode
-                            if code != nil
+                            if code
                                 keystrokes.concat code
                             else
                                 puts "unknown keystring: #{ks_str}"
                             end
                         end
-                        if function_and_args == nil
+                        if function_and_args.nil?
                             @keychains.deleteKeyPath( keystrokes )
                         else
                             function, function_args = function_and_args.split( /\s+/, 2 )
@@ -603,7 +681,8 @@ class Diakonos
                     end
                 when "context.visible", "context.combined", "eof_newline", "view.nonfilelines.visible",
                         /^lang\.(.+?)\.indent\.(?:auto|roundup|using_tabs|closers)$/,
-                        "found_cursor_start", "convert_tabs", 'delete_newline_on_delete_to_eol'
+                        "found_cursor_start", "convert_tabs", 'delete_newline_on_delete_to_eol',
+                        'suppress_welcome'
                     @settings[ command ] = arg.to_b
                 when "context.format", "context.separator.format", "status.format"
                     @settings[ command ] = arg.toFormatting
@@ -612,12 +691,16 @@ class Diakonos
                 when "context.separator", "status.left", "status.right", "status.filler",
                         "status.modified_str", "status.unnamed_str", "status.selecting_str",
                         "status.read_only_str", /^lang\..+?\.indent\.ignore\.charset$/,
-                        /^lang\.(.+?)\.tokens\.([^.]+)\.change_to$/, "view.nonfilelines.character",
+                        /^lang\.(.+?)\.tokens\.([^.]+)\.change_to$/,
+                        /^lang\.(.+?)\.column_delimiters$/,
+                        "view.nonfilelines.character",
                         'interaction.blink_string', 'diff_command'
                     @settings[ command ] = arg
+                when /^lang\..+?\.comment_(?:close_)?string$/
+                    @settings[ command ] = arg.gsub( /^["']|["']$/, '' )
                 when "status.vars"
                     @settings[ command ] = arg.split( /\s+/ )
-                when /^lang\.(.+?)\.indent\.size$/, /^lang\.(.+?)\.tabsize$/
+                when /^lang\.(.+?)\.indent\.size$/, /^lang\.(.+?)\.(?:tabsize|wrap_margin)$/
                     @settings[ command ] = arg.to_i
                 when "context.max_levels", "context.max_segment_width", "max_clips", "max_undo_lines",
                         "view.margin.x", "view.margin.y", "view.scroll_amount", "view.lookback"
@@ -687,8 +770,8 @@ class Diakonos
         @debug.flush
     end
     
-    def registerProc( proc, hook_name, priority = 0 )
-        @hooks[ hook_name ] << { :proc => proc, :priority => priority }
+    def register_proc( the_proc, hook_name, priority = 0 )
+        @hooks[ hook_name ] << { :proc => the_proc, :priority => priority }
     end
     
     def clearNonMovementFlag
@@ -705,7 +788,7 @@ class Diakonos
         if @settings[ "context.visible" ] and not @settings[ "context.combined" ]
             retval = retval - 1
         end
-        return retval
+        retval
     end
 
     def main_window_width
@@ -716,8 +799,10 @@ class Diakonos
         initializeDisplay
         
         @hooks = {
-            :after_save => [],
-            :after_startup => [],
+          :after_buffer_switch => [],
+          :after_open => [],
+          :after_save => [],
+          :after_startup => [],
         }
         Dir[ "#{@script_dir}/*" ].each do |script|
             begin
@@ -751,113 +836,146 @@ class Diakonos
         end
         
         if num_opened > 0
-            switchToBufferNumber 1
-            
-            updateStatusLine
-            updateContextLine
-            
-            if @post_load_script != nil
-                eval @post_load_script
-            end
-            
-            runHookProcs( :after_startup )
-            
-            begin
-                # Main keyboard loop.
-                while not @quitting
-                    processKeystroke
-                    @win_main.refresh
-                end
-            rescue SignalException => e
-                debugLog "Terminated by signal (#{e.message})"
-            end
-            
-            @debug.close
+          switchToBufferNumber 1
+          
+          updateStatusLine
+          updateContextLine
+          
+          if @post_load_script != nil
+            eval @post_load_script
+          end
+          
+          runHookProcs :after_startup
+          
+          if not @settings[ 'suppress_welcome' ]
+            openFile "#{@help_dir}/welcome.dhf"
+          end
+          
+          begin
+            # Main keyboard loop.
+            while not @quitting
+              processKeystroke
+              @win_main.refresh
+            end
+          rescue SignalException => e
+            debugLog "Terminated by signal (#{e.message})"
+          end
+          
+          @debug.close
+        end
+    end
+    
+    def capture_keychain( c, context )
+      if c == ENTER
+        @capturing_keychain = false
+        @current_buffer.deleteSelection
+        str = context.to_keychain_s.strip
+        @current_buffer.insertString str 
+        cursorRight( Buffer::STILL_TYPING, str.length )
+      else
+        keychain_pressed = context.concat [ c ]
+        
+        function_and_args = @keychains.getLeaf( keychain_pressed )
+        
+        if function_and_args
+          function, args = function_and_args
+        end
+        
+        partial_keychain = @keychains.getNode( keychain_pressed )
+        if partial_keychain
+          setILine( "Part of existing keychain: " + keychain_pressed.to_keychain_s + "..." )
+        else
+          setILine keychain_pressed.to_keychain_s + "..."
         end
+        processKeystroke( keychain_pressed )
+      end
+    end
+    
+    def capture_mapping( c, context )
+      if c == ENTER
+        @capturing_mapping = false
+        @current_buffer.deleteSelection
+        setILine
+      else
+        keychain_pressed = context.concat [ c ]
+        
+        function_and_args = @keychains.getLeaf( keychain_pressed )
+        
+        if function_and_args
+          function, args = function_and_args
+          setILine "#{keychain_pressed.to_keychain_s.strip}  ->  #{function}( #{args} )"
+        else
+          partial_keychain = @keychains.getNode( keychain_pressed )
+          if partial_keychain
+            setILine( "Several mappings start with: " + keychain_pressed.to_keychain_s + "..." )
+            processKeystroke( keychain_pressed )
+          else
+            setILine "There is no mapping for " + keychain_pressed.to_keychain_s
+          end
+        end
+      end
     end
     
     # context is an array of characters (bytes) which are keystrokes previously
     # typed (in a chain of keystrokes)
     def processKeystroke( context = [] )
-        c = @win_main.getch
+      c = @win_main.getch
         
-        if @capturing_keychain
-            if c == ENTER
-                @capturing_keychain = false
-                @current_buffer.deleteSelection
-                str = context.to_keychain_s.strip
-                @current_buffer.insertString str 
-                cursorRight( Buffer::STILL_TYPING, str.length )
-            else
-                keychain_pressed = context.concat [ c ]
-                
-                function_and_args = @keychains.getLeaf( keychain_pressed )
-                
-                if function_and_args != nil
-                    function, args = function_and_args
-                end
-                
-                partial_keychain = @keychains.getNode( keychain_pressed )
-                if partial_keychain != nil
-                    setILine( "Part of existing keychain: " + keychain_pressed.to_keychain_s + "..." )
-                else
-                    setILine keychain_pressed.to_keychain_s + "..."
-                end
-                processKeystroke( keychain_pressed )
-            end
-        else
+      if @capturing_keychain
+        capture_keychain c, context
+      elsif @capturing_mapping
+        capture_mapping c, context
+      else
         
-            if context.empty?
-                if c > 31 and c < 255 and c != BACKSPACE
-                    if @macro_history != nil
-                        @macro_history.push "typeCharacter #{c}"
-                    end
-                    if not @there_was_non_movement
-                        @there_was_non_movement = true
-                    end
-                    typeCharacter c
-                    return
-                end
-            end
-            keychain_pressed = context.concat [ c ]
-            
-            function_and_args = @keychains.getLeaf( keychain_pressed )
+        if context.empty?
+          if c > 31 and c < 255 and c != BACKSPACE
+            if @macro_history
+              @macro_history.push "typeCharacter #{c}"
+            end
+            @there_was_non_movement = true
+            typeCharacter c
+            return
+          end
+        end
+        keychain_pressed = context.concat [ c ]
             
-            if function_and_args != nil
-                function, args = function_and_args
-                setILine if not @settings[ "context.combined" ]
-                
-                if args != nil
-                    to_eval = "#{function}( #{args} )"
-                else
-                    to_eval = function
-                end
-                
-                if @macro_history != nil
-                    @macro_history.push to_eval
-                end
-                
-                begin
-                    eval to_eval, nil, "eval"
-                    @last_commands << to_eval unless to_eval == "repeatLast"
-                    if not @there_was_non_movement
-                        @there_was_non_movement = ( not to_eval.movement? )
-                    end
-                rescue Exception => e
-                    debugLog e.message
-                    debugLog e.backtrace.join( "\n\t" )
-                    showException e
-                end
-            else
-                partial_keychain = @keychains.getNode( keychain_pressed )
-                if partial_keychain != nil
-                    setILine( keychain_pressed.to_keychain_s + "..." )
-                    processKeystroke( keychain_pressed )
-                else
-                    setILine "Nothing assigned to #{keychain_pressed.to_keychain_s}"
-                end
-            end
+        function_and_args = @keychains.getLeaf( keychain_pressed )
+        
+        if function_and_args
+          function, args = function_and_args
+          setILine if not @settings[ "context.combined" ]
+          
+          if args
+            to_eval = "#{function}( #{args} )"
+          else
+            to_eval = function
+          end
+          
+          if @macro_history
+            @macro_history.push to_eval
+          end
+          
+          begin
+            eval to_eval, nil, "eval"
+            @last_commands << to_eval unless to_eval == "repeatLast"
+            if not @there_was_non_movement
+              @there_was_non_movement = ( not to_eval.movement? )
+            end
+          rescue Exception => e
+            debugLog e.message
+            debugLog e.backtrace.join( "\n\t" )
+            showException e
+          end
+        else
+          partial_keychain = @keychains.getNode( keychain_pressed )
+          if partial_keychain
+            setILine( keychain_pressed.to_keychain_s + "..." )
+            processKeystroke( keychain_pressed )
+          else
+            setILine "Nothing assigned to #{keychain_pressed.to_keychain_s}"
+          end
         end
+      end
     end
     protected :processKeystroke
 
@@ -868,7 +986,7 @@ class Diakonos
         @win_interaction.addstr( "%-#{Curses::cols}s" % string )
         @win_interaction.refresh
         Curses::curs_set 1
-        return string.length
+        string.length
     end
     
     def showClips
@@ -883,22 +1001,27 @@ class Diakonos
     end
 
     def switchTo( buffer )
-        switched = false
-        if buffer
-            @buffer_stack -= [ @current_buffer ]
-            if @current_buffer
-              @buffer_stack.push @current_buffer
-            end
-            @current_buffer = buffer
-            updateStatusLine
-            updateContextLine
-            buffer.display
-            switched = true
+      switched = false
+      if buffer
+        @buffer_stack -= [ @current_buffer ]
+        if @current_buffer
+          @buffer_stack.push @current_buffer
         end
-        
-        switched
+        @current_buffer = buffer
+        runHookProcs( :after_buffer_switch, buffer )
+        updateStatusLine
+        updateContextLine
+        buffer.display
+        switched = true
+      end
+      
+      switched
     end
     protected :switchTo
+    
+    def set_status_variable( identifier, value )
+      @status_vars[ identifier ] = value
+    end
 
     def buildStatusLine( truncation = 0 )
         var_array = Array.new
@@ -937,6 +1060,8 @@ class Diakonos
                     end
                 when "type"
                     var_array.push @current_buffer.original_language
+                when /^@/
+                  var_array.push @status_vars[ var ]
             end
         end
         str = nil
@@ -1027,32 +1152,30 @@ class Diakonos
     end
     
     def displayDequeue
-        @display_queue_mutex.synchronize do
-            if @display_queue != nil
-                Thread.new( @display_queue ) do |b|
-                    @display_mutex.lock
-                    @display_mutex.unlock
-                    b.display
-                end
-                @display_queue = nil
-            end
+      @display_queue_mutex.synchronize do
+        if @display_queue
+          Thread.new( @display_queue ) do |b|
+            @display_mutex.lock
+            @display_mutex.unlock
+            b.display
+          end
+          @display_queue = nil
         end
+      end
     end
 
     # completion_array is the array of strings that tab completion can use
-    def getUserInput( prompt, history = @rlh_general, initial_text = "", completion_array = nil )
+    def getUserInput( prompt, history = @rlh_general, initial_text = "", completion_array = nil, &block )
         if @playing_macro
             retval = @macro_input_history.shift
         else
-            pos = setILine prompt
-            @win_interaction.setpos( 0, pos )
-            retval = Readline.new( self, @win_interaction, initial_text, completion_array, history ).readline
-            if @macro_history != nil
+            retval = Readline.new( self, @win_interaction, prompt, initial_text, completion_array, history, &block ).readline
+            if @macro_history
                 @macro_input_history.push retval
             end
             setILine
         end
-        return retval
+        retval
     end
 
     def getLanguageFromName( name )
@@ -1063,7 +1186,7 @@ class Diakonos
                 break
             end
         end
-        return retval
+        retval
     end
     
     def getLanguageFromShaBang( first_line )
@@ -1074,12 +1197,12 @@ class Diakonos
                 break
             end
         end
-        return retval
+        retval
     end
     
     def showException( e, probable_causes = [ "Unknown" ] )
         begin
-            File.open( @diakonos_home + "/diakonos.err", "w" ) do |f|
+            File.open( @error_filename, "w" ) do |f|
                 f.puts "Diakonos Error:"
                 f.puts
                 f.puts e.message
@@ -1096,7 +1219,7 @@ class Diakonos
                 f.puts "----------------------------------------------------"
                 f.puts e.backtrace
             end
-            openFile( @diakonos_home + "/diakonos.err" )
+            openFile( @error_filename )
         rescue Exception => e2
             debugLog "EXCEPTION: #{e.message}"
             debugLog "\t#{e.backtrace}"
@@ -1200,7 +1323,7 @@ class Diakonos
             retval.gsub!( /\$s/, text_filename )
         end
         
-        return retval
+        retval
     end
     
     def showMessage( message, non_interaction_duration = @settings[ 'interaction.choice_delay' ] )
@@ -1310,7 +1433,7 @@ class Diakonos
             @do_display = false
         end
         
-        return retval
+        retval
     end
 
     def startRecordingMacro( name = nil )
@@ -1382,6 +1505,9 @@ class Diakonos
     def showing_list?
       @list_buffer
     end
+    def list_item_selected?
+      @list_buffer and @list_buffer.selecting?
+    end
     def current_list_item
       if @list_buffer
         @list_buffer.select_current_line
@@ -1407,6 +1533,14 @@ class Diakonos
       end
     end
     
+    def open_help_buffer
+      @help_buffer = openFile( @help_filename )
+    end
+    def close_help_buffer
+      closeFile @help_buffer
+      @help_buffer = nil
+    end
+    
     def runHookProcs( hook_id, *args )
         @hooks[ hook_id ].each do |hook_proc|
             hook_proc[ :proc ].call( *args )
@@ -1567,12 +1701,29 @@ class Diakonos
     end
     
     def collapseWhitespace
-        @current_buffer.collapseWhitespace
+      @current_buffer.collapseWhitespace
+    end
+    
+    def columnize( delimiter = nil, num_spaces_padding = 0 )
+      if delimiter.nil?
+        delimiter = getUserInput(
+          "Column delimiter (regexp): ",
+          @rlh_general,
+          @settings[ "lang.#{@current_buffer.original_language}.column_delimiters" ] || ''
+        )
+      end
+      if delimiter and num_spaces_padding
+        @current_buffer.columnize Regexp.new( delimiter ), num_spaces_padding
+      end
+    end
+    
+    def comment_out
+      @current_buffer.comment_out
     end
 
     def copySelection
-        @clipboard.addClip @current_buffer.copySelection
-        removeSelection
+      @clipboard.addClip @current_buffer.copySelection
+      removeSelection
     end
 
     def copy_selection_to_klipper
@@ -1740,46 +1891,82 @@ class Diakonos
     end
     
     def find( dir_str = "down", case_sensitive = CASE_INSENSITIVE, regexp_source_ = nil, replacement = nil )
-        if regexp_source_ == nil
-            if @current_buffer.changing_selection
-                selected_text = @current_buffer.copySelection[ 0 ]
-            end
-            regexp_source = getUserInput( "Search regexp: ", @rlh_search, ( selected_text or "" ) )
-        else
-            regexp_source = regexp_source_
+      direction = dir_str.toDirection
+      if regexp_source_.nil?
+        if @current_buffer.changing_selection
+          selected_text = @current_buffer.copySelection[ 0 ]
         end
-
-        if regexp_source != nil
-            direction = dir_str.toDirection
-            rs_array = regexp_source.newlineSplit
-            regexps = Array.new
-            begin
-                rs_array.each do |regexp_source|
-                    if not case_sensitive
-                        regexps.push Regexp.new( regexp_source, Regexp::IGNORECASE )
-                    else
-                        regexps.push Regexp.new( regexp_source )
-                    end
-                end
-            rescue Exception => e
-                exception_thrown = true
-                rs_array.each do |regexp_source|
-                    if not case_sensitive
-                        regexps.push Regexp.new( Regexp.escape( regexp_source ), Regexp::IGNORECASE )
-                    else
-                        regexps.push Regexp.new( Regexp.escape( regexp_source ) )
-                    end
-                end
-            end
-            if replacement == ASK_REPLACEMENT
-                replacement = getUserInput( "Replace with: ", @rlh_search )
-            end
-            
-            setILine( "Searching literally; #{e.message}" ) if exception_thrown
-            
-            @current_buffer.find( regexps, direction, replacement )
-            @last_search_regexps = regexps
+        starting_row, starting_col = @current_buffer.last_row, @current_buffer.last_col
+        
+        regexp_source = getUserInput(
+          "Search regexp: ",
+          @rlh_search,
+          ( selected_text or "" )
+        ) { |input|
+          if input.length > 1
+            find_ direction, case_sensitive, input, nil, starting_row, starting_col, QUIET
+          else
+            @current_buffer.removeSelection Buffer::DONT_DISPLAY
+            @current_buffer.clearMatches Buffer::DO_DISPLAY
+          end
+        }
+      else
+        regexp_source = regexp_source_
+      end
+      
+      if regexp_source
+        find_ direction, case_sensitive, regexp_source, replacement, starting_row, starting_col, NOISY
+      elsif starting_row and starting_col
+        @current_buffer.clearMatches
+        @current_buffer.cursorTo starting_row, starting_col
+      end
+    end
+    
+    # Worker method for find function.
+    def find_( direction, case_sensitive, regexp_source, replacement, starting_row, starting_col, quiet )
+      return if( regexp_source.nil? or regexp_source.empty? )
+      
+      rs_array = regexp_source.newlineSplit
+      regexps = Array.new
+      exception_thrown = nil
+      
+      rs_array.each do |source|
+        begin
+          warning_verbosity = $VERBOSE
+          $VERBOSE = nil
+          regexps << Regexp.new(
+            source,
+            case_sensitive ? nil : Regexp::IGNORECASE
+          )
+          $VERBOSE = warning_verbosity
+        rescue RegexpError => e
+          if not exception_thrown
+            exception_thrown = e
+            source = Regexp.escape( source )
+            retry
+          else
+            raise e
+          end
         end
+      end
+      
+      if replacement == ASK_REPLACEMENT
+        replacement = getUserInput( "Replace with: ", @rlh_search )
+      end
+      
+      if exception_thrown and not quiet
+        setILine( "Searching literally; #{exception_thrown.message}" )
+      end
+      
+      @current_buffer.find(
+        regexps,
+        :direction => direction,
+        :replacement => replacement,
+        :starting_row => starting_row,
+        :starting_col => starting_col,
+        :quiet => quiet
+      )
+      @last_search_regexps = regexps
     end
 
     def findAgain( dir_str = nil )
@@ -1806,8 +1993,8 @@ class Diakonos
         end
         if search_term != nil
             direction = dir_str.toDirection
-            regexp = Regexp.new( Regexp.escape( search_term ) )
-            @current_buffer.find( regexp, direction )
+            regexp = [ Regexp.new( Regexp.escape( search_term ) ) ]
+            @current_buffer.find( regexp, :direction => direction )
             @last_search_regexps = regexp
         end
     end
@@ -1909,29 +2096,106 @@ class Diakonos
         goToTag @current_buffer.wordUnderCursor
     end
     
-    def help
-        help_filename = @diakonos_home + "/diakonos.help"
-        File.open( help_filename, "w" ) do |help_file|
-            sorted_keychains = @keychains.paths_and_leaves.sort { |a,b|
-                a[ :leaf ][ 0 ] <=> b[ :leaf ][ 0 ]
-            }
-            sorted_keychains.each do |keystrokes_and_function_and_args|
-                keystrokes = keystrokes_and_function_and_args[ :path ]
-                function, args = keystrokes_and_function_and_args[ :leaf ]
-                function_string = function.deep_clone
-                if args != nil and args.length > 0
-                    function_string << "( #{args} )"
-                end
-                keychain_width = [ Curses::cols - function_string.length - 2, Curses::cols / 2 ].min
-                help_file.puts(
-                    "%-#{keychain_width}s%s" % [
-                        keystrokes.to_keychain_s,
-                        function_string
-                    ]
-                )
-            end
+    def with_list_file
+      File.open( @list_filename, "w" ) do |f|
+        yield f
+      end
+    end
+    
+    def matching_help_documents( str )
+      docs = []
+
+      if str =~ %r{^/(.+)$}
+        regexp = $1
+        files = Dir[ "#{@help_dir}/*" ].select{ |f|
+          File.open( f ) { |io| io.grep( /#{regexp}/i ) }.any?
+        }
+      else
+        terms = str.gsub( /[^a-zA-Z0-9-]/, ' ' ).split.join( '|' )
+        file_grep = `egrep -i -l '^Tags.*\\b(#{terms})\\b' #{@help_dir}/*`
+        files = file_grep.split( /\s+/ )
+      end
+      
+      files.each do |file|
+        File.open( file ) do |f|
+          docs << ( "%-300s | %s" % [ f.gets.strip, file ] )
         end
-        openFile help_filename
+      end
+      
+      docs.sort { |a,b| a.gsub( /^# (?:an?|the) */i, '# ' ) <=> b.gsub( /^# (?:an?|the) */i, '# ' ) }
+    end
+    
+    def open_help_document( selected_string )
+      help_file = selected_string.split( "| " )[ -1 ]
+      if File.exist? help_file
+        openFile help_file
+      end
+    end
+    
+    def help( prefill = '' )
+      open_help_buffer
+      matching_docs = nil
+      
+      selected = getUserInput(
+        "Search terms: ",
+        @rlh_help,
+        prefill,
+        @help_tags
+      ) { |input|
+        next if input.length < 3 and input[ 0..0 ] != '/'
+        
+        matching_docs = matching_help_documents( input )
+        with_list_file do |list|
+          list.puts matching_docs.join( "\n" )
+        end
+        
+        openListBuffer
+      }
+      
+      close_help_buffer
+      
+      case selected
+      when /\|/
+        open_help_document selected
+      when nil
+        # Help search aborted; do nothing
+      else
+        # Not a selected help document
+        if matching_docs.nil? or matching_docs.empty?
+          matching_docs = matching_help_documents( selected )
+        end
+        
+        case matching_docs.size
+        when 1
+          open_help_document matching_docs[ 0 ]
+        when 0
+          File.open( @error_filename, 'w' ) do |f|
+            f.puts "There were no help documents matching your search."
+            f.puts "(#{selected.strip})"
+          end
+          error_file = openFile @error_filename
+          
+          choice = getChoice(
+            "Send your search terms to purepistos.net to help improve Diakonos?",
+            [ CHOICE_YES, CHOICE_NO ]
+          )
+          case choice
+          when CHOICE_YES
+            require 'net/http'
+            require 'uri'
+            
+            res = Net::HTTP.post_form(
+              URI.parse( 'http://dh.purepistos.net/' ),
+              { 'q' => selected }
+            )
+          # TODO: let them choose "never" and "always"
+          end
+          
+          closeFile error_file
+        else
+          help selected
+        end
+      end
     end
 
     def indent
@@ -1970,7 +2234,7 @@ class Diakonos
     end
 
     def list_buffers
-      File.open( @list_filename, "w" ) do |f|
+      with_list_file do |f|
         f.puts @buffers.keys.map { |name| "#{name}\n" }.sort
       end
       openListBuffer
@@ -2084,6 +2348,7 @@ class Diakonos
         
         if do_open
           buffer = Buffer.new( self, filename, buffer_key, read_only )
+          runHookProcs( :after_open, buffer )
           @buffers[ buffer_key ] = buffer
           if switchTo( buffer ) and line_number
             @current_buffer.goToLine( line_number, 0 )
@@ -2095,17 +2360,23 @@ class Diakonos
     end
   
     def openFileAsk
-        if @current_buffer != nil and @current_buffer.name != nil
-            path = File.expand_path( File.dirname( @current_buffer.name ) ) + "/"
-            file = getUserInput( "Filename: ", @rlh_files, path )
-        else
-            file = getUserInput( "Filename: ", @rlh_files )
-        end
-        if file != nil
-            openFile file
-            updateStatusLine
-            updateContextLine
+      prefill = ''
+      
+      if @current_buffer
+        if @current_buffer.current_line =~ %r{/} and @current_buffer.current_line =~ %r{[/\w.]+}
+          prefill = $&
+        elsif @current_buffer.name
+          prefill = File.expand_path( File.dirname( @current_buffer.name ) ) + "/"
         end
+      end
+      
+      file = getUserInput( "Filename: ", @rlh_files, prefill )
+      
+      if file
+        openFile file
+        updateStatusLine
+        updateContextLine
+      end
     end
     
     def operateOnString(
@@ -2226,9 +2497,14 @@ class Diakonos
         end
     end
     
+    def print_mapped_function
+      @capturing_mapping = true
+      setILine "Type any chain of keystrokes or key chords, or press Enter to stop."
+    end
+    
     def printKeychain
-        @capturing_keychain = true
-        setILine "Type any chain of keystrokes or key chords, then press Enter..."
+      @capturing_keychain = true
+      setILine "Type any chain of keystrokes or key chords, then press Enter..."
     end
 
     def quit
@@ -2322,14 +2598,26 @@ class Diakonos
         end
     end
     
+    def select_all
+      @current_buffer.select_all
+    end
+    
     def select_block( beginning = nil, ending = nil, including_ending = true )
       if beginning.nil?
-        beginning = Regexp.new( getUserInput( "Start at regexp: " ) )
+        input = getUserInput( "Start at regexp: " )
+        if input
+          beginning = Regexp.new input
+        end
+      end
+      if beginning and ending.nil?
+        input = getUserInput( "End before regexp: " )
+        if input
+          ending = Regexp.new input
+        end
       end
-      if ending.nil?
-        ending = Regexp.new( getUserInput( "End before regexp: " ) )
+      if beginning and ending
+        @current_buffer.select( beginning, ending, including_ending )
       end
-      @current_buffer.select( beginning, ending, including_ending )
     end
 
     def scrollDown
@@ -2386,17 +2674,17 @@ class Diakonos
         updateStatusLine
     end
 
-    def shell( command_ = nil )
+    def shell( command_ = nil, result_filename = 'shell-result.txt' )
         if command_ == nil
             command = getUserInput( "Command: ", @rlh_shell )
         else
             command = command_
         end
-
-        if command != nil
+        
+        if command
             command = subShellVariables( command )
 
-            result_file = @diakonos_home + "/shell-result.txt"
+            result_file = "#{@diakonos_home}/#{result_filename}"
             File.open( result_file , "w" ) do |f|
                 f.puts command
                 f.puts
@@ -2541,6 +2829,10 @@ class Diakonos
         end
     end
     
+    def uncomment
+      @current_buffer.uncomment
+    end
+
     def undo( buffer = @current_buffer )
         buffer.undo
     end
@@ -2567,6 +2859,10 @@ class Diakonos
     def unundo( buffer = @current_buffer )
         buffer.unundo
     end
+    
+    def wrap_paragraph
+      @current_buffer.wrap_paragraph
+    end
 end
 
 end