diakonos 0.8.6 → 0.8.7

data/CHANGELOG

@@ -1,6 +1,24 @@
 Diakonos Changelog
 ------------------
 
+0.8.7
+
+- MRU buffer history added.
+- strip_trailing_whitespace_on_save setting added.
+- Sessions (named and unnamed) added.
+- grep as you type added.
+- delete_to added.
+- delete_to_and_from added.
+- find.return_on_abort setting added.
+- Makefile config added.
+- Markdown config added.
+- Sass config added.
+- Now including custom.conf from default diakonos.conf.
+- Help files updated.
+- Some Ruby 1.9 compatibility introduced.
+- Lots of code refactoring done.
+- Numerous little adjustments and fixes made.
+
 0.8.6
 
 - Find-as-you-type added.

data/LICENCE

@@ -1,6 +1,6 @@
 The MIT Licence
 
-Copyright (c) 2004-2008 Pistos
+Copyright (c) 2004-2009 Pistos
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README

@@ -6,7 +6,7 @@ Diakonos
 INSTALLATION
 ============
 
-There are three ways to install Ruby:
+There are three ways to install Diakonos:
   * by rubygems (recommended)
   * from the tarball using setup.rb
   * manual file copy
@@ -34,7 +34,7 @@ If you want to set options like the installation directories:
 
 By default, the installer copies bin/diakonos into a system-wide bin directory,
 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
+such as /usr/lib/ruby/site_ruby/1.8 .  You may need root privileges on the
 system in order to install to system-wide places like /usr/bin .
 
 === Installing from tarball by manual copy ===
@@ -59,7 +59,7 @@ or
 
 or, for other options and arguments,
 
-  diakonos --help 
+  diakonos --help
 
 For help using Diakonos, simply press F1 from within the editor to use the
 interactive help system.

data/diakonos-256-colour.conf

@@ -7,6 +7,7 @@ colour 37 111 17     # single-quoted strings;   light blue on dark blue
 colour 38 117 18     # double-quoted strings;   light blue on dark blue
 colour 39 213 90     # shell-quoted strings;    light purple on purple
 colour 40 15 234     # constants;               white on light black
+colour 44 224 88     # Ruby modifiers;          light red on dark red
 
 colour 41 15 233     # XML nodes;               white on light black
 colour 42 45 233     # XML attributes;          light blue on black

data/diakonos.conf

@@ -2,6 +2,8 @@
 
 logfile ~/.diakonos/diakonos.log
 
+#session.default_session default-session
+
 # When the cursor is view.margin.y lines or less from the top or
 # bottom line, repeatedly scroll the screen view.jump.y lines until
 # the cursor is more than view.margin.y lines from the top and
@@ -46,8 +48,10 @@ 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).  
+# beginning (true).
 found_cursor_start false
+find.return_on_abort false
+grep.context 0
 
 max_clips 30
 
@@ -56,6 +60,7 @@ max_clips 30
 max_undo_lines 16384
 
 convert_tabs false
+strip_trailing_whitespace_on_save true
 
 diff_command diff -U 5
 
@@ -63,13 +68,15 @@ diff_command diff -U 5
 # before opening them.
 use_magic_file false
 
+fuzzy_file_find false
+
 # ---------------------------------------------------------------------
 # Status Line
 
 # Use "% syntax" as placeholders
 # e.g. %d for decimal integers, %s for strings
 status.left -- %s %s%s%s -- (%s) --%s
-status.right - Buf %d of %d --- L%3d/%3d C%2d --
+status.right - %s 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.
 status.filler -
@@ -78,8 +85,9 @@ status.selecting_str (selecting)
 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 @git_branch buffer_number num_buffers row num_lines col
+# line row num_lines col filename modified type buffer_number num_buffers selecting session_name read_only
+status.vars filename modified read_only selecting type @git_branch session_name 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
 
 # ---------------------------------------------------------------------
@@ -201,34 +209,41 @@ key alt+t;goToTag
 key alt+);goToTagUnderCursor
 key alt+(;popTag
 
-key backspace;backspace
-key ctrl+h;backspace
-key del;delete
-#key ctrl+k;deleteLine
-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
-#key ctrl+alt+l;unindent
-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
-key esc [ 1 1 ~   help
-key esc [ [ A     help
+key backspace      backspace
+key ctrl+h         backspace
+key del            delete
+#key ctrl+k        deleteLine
+key ctrl+k         deleteAndStoreLine
+key ctrl+alt+k     deleteToEOL
+key ctrl+d t       delete_to
+key ctrl+d ctrl+t  delete_to
+key ctrl+d i       delete_to_and_from
+key ctrl+d ctrl+i  delete_to_and_from
+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
+#key ctrl+alt+l    unindent
+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
+key esc [ 1 1 ~    help
+key esc [ [ A      help
+key f13            help
+key esc O 2 P      help
+key esc O 1 ; 2 P  help
 key f11;loadConfiguration
 key esc [ 2 3 ~;loadConfiguration
 key f12;openFile "~/.diakonos/diakonos.conf"
@@ -241,13 +256,20 @@ key esc W;toggleSessionSetting 'view.wrap.visual', DO_REDRAW
 
 key ctrl+n;newFile
 key ctrl+o;openFileAsk
-key ctrl+s;saveFile
-key alt+s;saveFileAs
+key alt+o    open_matching_files
+key ctrl+s   saveFile
+key esc S    saveFileAs
 key ctrl+w;closeFile
 key ctrl+alt+o;revert
 key alt+!;setReadOnly
 key ctrl+q;quit
-key esc T;setBufferType
+key esc T    setBufferType
+key esc s esc n    name_session
+key esc s n        name_session
+key esc s esc l    load_session
+key esc s l        load_session
+key esc s esc d    set_session_dir
+key esc s d        set_session_dir
 
 key alt+1;switchToBufferNumber 1
 key alt+2;switchToBufferNumber 2
@@ -265,10 +287,12 @@ 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+a    select_all
+key ctrl+c         copySelection
+key esc [ 2 ; 5 ~  copySelection
+key ctrl+x         cutSelection
+key keycode383     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
@@ -311,6 +335,9 @@ key ctrl+r   searchAndReplace
 key alt+r    searchAndReplace CASE_SENSITIVE
 key ctrl+alt+u;clearMatches
 key alt+c;close_code
+key esc g       grep
+key esc G       grep_buffers
+key ctrl+alt+g  grep_dir
 
 key f2            shell
 key esc O Q       shell
@@ -442,7 +469,7 @@ lang.dhf.wrap_margin 80
 
 # XML
 
-lang.xml.filemask \.(xml|xsl|rdl|aiml|xhtml)$
+lang.xml.filemask \.(xml|xsl|rdl|aiml)$
 lang.xml.format.default white
 lang.xml.format.selection inverse
 lang.xml.format.found yellow inverse
@@ -453,21 +480,21 @@ lang.xml.indent.roundup true
 #lang.xml.indent.using_tabs true
 lang.xml.tokens.entities &\S+?;
 lang.xml.tokens.entities.format magenta bold
-lang.xml.tokens.code.open (<)(?:[^%]|$)
-lang.xml.tokens.code.close (?:[^%]|^)(>)
-lang.xml.tokens.code.format white bold
-lang.xml.tokens.code.change_to xml_tag
 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_string "<!-- "
 lang.xml.comment_close_string " -->"
+lang.xml.tokens.code.open (<)(?:[^%]|$)
+lang.xml.tokens.code.close (?:[^%]|^)(>)
+lang.xml.tokens.code.format white bold
+lang.xml.tokens.code.change_to xml_tag
 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.regexp .*<([^/> ]*)
 lang.xml.closers.tag.closer { |m| "</" + m[ 1 ] + ">" }
 lang.xml_tag.format.default white bold
 lang.xml_tag.format.selection inverse
@@ -503,10 +530,12 @@ lang.html.indent.size 2
 lang.html.indent.auto true
 lang.html.indent.roundup true
 #lang.html.indent.using_tabs true
-lang.html.tokens.code.open (<)(?:[^%]|$)
-lang.html.tokens.code.close (?:[^%]|^)(>)
-lang.html.tokens.code.format white bold
-lang.html.tokens.code.change_to html_tag
+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.tokens.entities &\S+?;
 lang.html.tokens.entities.format magenta bold
 lang.html.tokens.eruby.open <%
@@ -525,12 +554,10 @@ lang.html.tokens.php.open <\?(?:php)?
 lang.html.tokens.php.close \?>
 lang.html.tokens.php.format 10 bold
 lang.html.tokens.php.change_to php
-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.tokens.code.open (<)(?:[^%]|$)
+lang.html.tokens.code.close (?:[^%]|^)(>)
+lang.html.tokens.code.format white bold
+lang.html.tokens.code.change_to html_tag
 lang.html.closers.tag.regexp <([^/> ]*)
 lang.html.closers.tag.closer { |m| "</" + m[ 1 ] + ">" }
 lang.html_tag.format.default white bold
@@ -583,7 +610,7 @@ 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_string "/* "
 lang.css.comment_close_string " */"
 lang.css.tokens.numbers \b([0-9]+\.[0-9]+|[0-9]+)
 lang.css.tokens.numbers.format blue bold
@@ -597,24 +624,33 @@ lang.css.column_delimiters :|,
 
 # Ruby
 
-lang.ruby.filemask (?:[Rr]akefile)|(?:\.(?:rb|gem(?:spec)?)$)
-lang.ruby.bangmask ruby
+lang.ruby.filemask (?:[Rr]akefile)|(?:\.(?:rb|gem(?:spec)?|rake)$)
+lang.ruby.bangmask #!.*ruby
 lang.ruby.format.default white bold
 lang.ruby.format.selection inverse
 lang.ruby.format.found yellow inverse
-lang.ruby.tokens.reserved_words \b(__FILE__|and|def|end|in|or|self|unless|__LINE__|begin|defined\?|ensure|module|redo|super|until|BEGIN|break|do|false|next|rescue|then|when|END|case|else|for|nil|retry|true|while|alias|class|elsif|if|not|return|undef|yield)\b
+lang.ruby.tokens.reserved_words \b(__FILE__|and|def|end|in|or|self|__LINE__|begin|defined\?|ensure|module|redo|super|until|BEGIN|break|do|false|next|rescue|then|when|END|case|else|for|nil|retry|true|while|alias|class|elsif|not|return|undef|yield)\b
 lang.ruby.tokens.reserved_words.format white
+lang.ruby.tokens.non_modifiers ^\s*(if|unless)
+lang.ruby.tokens.non_modifiers.format white
+lang.ruby.tokens.modifiers \s+(if|unless)
+lang.ruby.tokens.modifiers.format 44
 lang.ruby.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
 lang.ruby.tokens.constants.format yellow bold
 lang.ruby.tokens.symbols [^:](:[a-zA-Z_][a-zA-Z_0-9]*)
 lang.ruby.tokens.symbols.format white bold
-lang.ruby.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;~]
-lang.ruby.tokens.non_alphanum.format white
-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.comment_string "# "
+lang.ruby.tokens.long_comments.open ^=begin
+lang.ruby.tokens.long_comments.close ^=end
+lang.ruby.tokens.long_comments.format 8 bold
+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.tokens.instance_variables (@[A-Za-z_][A-Za-z_0-9]*)
+lang.ruby.tokens.instance_variables.format white bold
 lang.ruby.tokens.regular_expressions (\/.+?[^\\]\/)
 lang.ruby.tokens.regular_expressions.format red bold
 lang.ruby.tokens.regular_expressions2 (%r\{.+?[^\}]\})
@@ -645,13 +681,8 @@ 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
-lang.ruby.tokens.long_comments.close ^=end
-lang.ruby.tokens.long_comments.format 8 bold
-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.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;~]
+lang.ruby.tokens.non_alphanum.format white
 lang.ruby.indent.size 2
 lang.ruby.indent.auto true
 lang.ruby.indent.roundup true
@@ -667,7 +698,7 @@ lang.ruby.column_delimiters =>?|:|,
 # PHP
 
 lang.php.filemask \.php\d?$
-lang.php.bangmask php
+lang.php.bangmask #!.*php
 lang.php.format.default white bold
 lang.php.format.selection inverse
 lang.php.format.found yellow inverse
@@ -681,14 +712,12 @@ 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 ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.php.tokens.non_alphanum.format white
+lang.php.comment_string "// "
 lang.php.tokens.long_comments.open \/\*
 lang.php.tokens.long_comments.close \*\/
 lang.php.tokens.long_comments.format 8 bold
+lang.php.tokens.preprocessor (^\s*#.*)
+lang.php.tokens.preprocessor.format yellow bold
 lang.php.tokens.sql_string.open (<<<EOS)
 lang.php.tokens.sql_string.close (EOS)
 lang.php.tokens.sql_string.format 1
@@ -697,6 +726,8 @@ lang.php.tokens.js.open (<<<EOJS)
 lang.php.tokens.js.close (EOJS)
 lang.php.tokens.js.format 12 bold
 lang.php.tokens.js.change_to java
+lang.php.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.php.tokens.non_alphanum.format white
 lang.php.indent.size 4
 lang.php.indent.auto true
 lang.php.indent.roundup false
@@ -710,17 +741,15 @@ lang.php.context.ignore ^(.+:|\s*\{?)$
 # Perl
 
 lang.perl.filemask \.(?:pl|pm)$
-lang.perl.bangmask perl
+lang.perl.bangmask #!.*perl
 lang.perl.format.default white bold
 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.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 [!#^&*()\[\]{}/?=+\-\\|,<.>;:~]
-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 (\".*?[^\\]\")
@@ -737,6 +766,8 @@ lang.perl.tokens.array_variables \s(@[A-Za-z_][A-Za-z_0-9]*)\b
 lang.perl.tokens.array_variables.format red bold
 lang.perl.tokens.hash_variables \s(%[A-Za-z_][A-Za-z_0-9]*)\b
 lang.perl.tokens.hash_variables.format magenta bold
+lang.perl.tokens.non_alphanum [!#^&*()\[\]{}/?=+\-\\|,<.>;:~]
+lang.perl.tokens.non_alphanum.format white
 lang.perl.indent.size 4
 lang.perl.indent.auto true
 lang.perl.indent.roundup true
@@ -753,17 +784,15 @@ lang.perl.column_delimiters =>?|:|,
 # Python
 
 lang.python.filemask \.py$
-lang.python.bangmask python
+lang.python.bangmask #!.*python
 lang.python.format.default white bold
 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.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.comment_string "# "
 lang.python.tokens.doublequoted_strings (\".*?[^\\]\")
 lang.python.tokens.doublequoted_strings.format green bold
 lang.python.tokens.singlequoted_strings ('.*?[^\\]')
@@ -772,6 +801,8 @@ lang.python.tokens.backquoted_strings (`.*?[^\\]`)
 lang.python.tokens.backquoted_strings.format red bold
 lang.python.tokens.reserved_words \b(and|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|yield)\b
 lang.python.tokens.reserved_words.format white
+lang.python.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:~]
+lang.python.tokens.non_alphanum.format white
 lang.python.indent.size 4
 lang.python.indent.auto true
 lang.python.indent.roundup true
@@ -798,14 +829,14 @@ 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.comment_string "// "
 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.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.java.tokens.non_alphanum.format white
 lang.java.indent.size 4
 lang.java.indent.auto true
 lang.java.indent.roundup false
@@ -814,6 +845,7 @@ lang.java.indent.indenters (\{)
 lang.java.indent.unindenters (\})
 lang.java.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
 lang.java.indent.ignore ^(.+:|\s*?)$
+lang.java.indent.closers true
 lang.java.context.ignore ^(.+:|\s*\{?)$
 lang.java.closers.for.regexp for$
 lang.java.closers.for.closer { |m| "( $i = 0; $i < limit; $i++ ) {\n%_\n}" }
@@ -835,14 +867,14 @@ 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.comment_string "// "
 lang.c.tokens.preprocessor (^\s*#.*)
 lang.c.tokens.preprocessor.format yellow bold
-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
+lang.c.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.c.tokens.non_alphanum.format white
 lang.c.indent.size 4
 lang.c.indent.auto true
 lang.c.indent.roundup false
@@ -859,11 +891,11 @@ lang.conf.filemask (?:\.conf(?:ig)?|\.cfg|\.cnf|user_prefs|XF86Config)$
 lang.conf.format.default white
 lang.conf.format.selection inverse
 lang.conf.format.found yellow inverse
-lang.conf.tokens.commands ^\s*([^\s=]+)
+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.comment_string "# "
 lang.conf.tokens.doublequoted_strings (\".*?[^\\]\")
 lang.conf.tokens.doublequoted_strings.format green bold
 lang.conf.tokens.singlequoted_strings ('.*?[^\\]')
@@ -881,7 +913,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.comment_string "# "
 lang.crontab.tokens.schedule ^((?:[0-9\/*,-]+\s+){5})
 lang.crontab.tokens.schedule.format cyan bold
 lang.crontab.tokens.commands ^(\S+=.+)
@@ -897,7 +929,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.comment_string "# "
 lang.fstab.indent.size 4
 lang.fstab.indent.auto true
 lang.fstab.indent.roundup true
@@ -922,13 +954,13 @@ 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.comment_string "-- "
 lang.sql.tokens.singlequoted_strings ('.*?[^\\]')
 lang.sql.tokens.singlequoted_strings.format green bold
-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.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.sql.tokens.non_alphanum.format white
 lang.sql.indent.indenters ((?:\(|BEGIN|DECLARE|FROM|LOOP|ORDER BY|SELECT|SET|WHERE)$)
 lang.sql.indent.unindenters (^\s+(?:\)|;|BEGIN|DECLARE|END))
 lang.sql.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')
@@ -937,7 +969,7 @@ lang.sql.context.ignore ^(\W+)$
 # Bash
 
 lang.bash.filemask (?:\.(?:ebuild|bash_profile|bashrc))$
-lang.bash.bangmask (?:ba)?sh\b
+lang.bash.bangmask #!.*(?:ba)?sh\b
 lang.bash.format.default white bold
 lang.bash.format.selection inverse
 lang.bash.format.found yellow inverse
@@ -948,7 +980,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.comment_string "# "
 lang.bash.tokens.singlequoted_strings ('.*?[^\\]')
 lang.bash.tokens.singlequoted_strings.format green bold
 lang.bash.tokens.doublequoted_strings (\".*?[^\\]\")
@@ -963,7 +995,7 @@ lang.bash.indent.ignore ^(.+:|\s*?)$
 # Tcl
 
 lang.tcl.filemask \.tcl$
-lang.tcl.bangmask tcl
+lang.tcl.bangmask #!.*tcl
 lang.tcl.format.default white bold
 lang.tcl.format.selection inverse
 lang.tcl.format.found yellow inverse
@@ -974,15 +1006,15 @@ 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.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 ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-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 (\".*?[^\\]\")
 lang.tcl.tokens.doublequoted_strings.format green bold
+lang.tcl.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.tcl.tokens.non_alphanum.format white
 lang.tcl.indent.indenters (\{)
 lang.tcl.indent.unindenters (\})
 lang.tcl.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
@@ -1011,7 +1043,7 @@ lang.diff.tokens.diff_command (^diff .+$)
 lang.diff.tokens.diff_command.format 13 bold
 
 lang.yaml.filemask (?:\.ya?ml)$
-lang.yaml.bangmask ^---
+lang.yaml.bangmask ^---(?:.[^/]|$)
 lang.yaml.format.default white bold
 lang.yaml.format.selection inverse
 lang.yaml.format.found yellow inverse
@@ -1047,7 +1079,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.comment_string "# "
 lang.yaml.tokens.anchor_indicator (&\w+)
 lang.yaml.tokens.anchor_indicator.format red bold
 lang.yaml.tokens.alias_indicator (\*\w+)
@@ -1093,12 +1125,109 @@ lang.haml.tokens.html_comment.format 8 bold
 lang.haml.tokens.line_joiner \|$
 lang.haml.tokens.line_joiner.format 12 bold
 
+lang.sass.filemask \.sass$
+lang.sass.format.default white
+lang.sass.format.selection inverse
+lang.sass.format.found yellow inverse
+lang.sass.tabsize 2
+lang.sass.indent.size 2
+lang.sass.indent.auto true
+lang.sass.indent.roundup true
+lang.sass.indent.using_tabs false
+lang.sass.tokens.rules ^[A-Za-z0-9,.#\s_-]+$
+lang.sass.tokens.rules.format cyan bold
+lang.sass.tokens.attributes ^ *(?::\S+|[A-Za-z0-9_-]+: )
+lang.sass.tokens.attributes.format white bold
+lang.sass.tokens.colour #(?:[A-Fa-f0-9]{3}){1,2}\b
+lang.sass.tokens.colour.format yellow bold
+lang.sass.tokens.units \d+ *(px|em|pt)\b
+lang.sass.tokens.units.format brown
+lang.sass.tokens.silent_comments (\/\/.*)
+lang.sass.tokens.silent_comments.format 8 bold
+lang.sass.tokens.loud_comments (\/\*.*)
+lang.sass.tokens.loud_comments.format 8 bold
+lang.sass.tokens.line_joiner \|$
+lang.sass.tokens.line_joiner.format 12 bold
+lang.sass.tokens.parent (&):
+lang.sass.tokens.parent.format red bold
+
+lang.makefile.filemask Makefile$
+lang.makefile.format.default white
+lang.makefile.format.selection inverse
+lang.makefile.format.found yellow inverse
+lang.makefile.tokens.assignment_lhs ^\s*([^\s=]+)\s*[+?]?=
+lang.makefile.tokens.assignment_lhs.format white bold
+lang.makefile.tokens.comments (^\s*#.*)
+lang.makefile.tokens.comments.format 8 bold
+lang.makefile.comment_string "# "
+lang.makefile.tokens.targets (^\S+):
+lang.makefile.tokens.targets.format yellow bold
+lang.makefile.tokens.references @?\$(?:\(.+?\)|\w+)
+lang.makefile.tokens.references.format green bold
+lang.makefile.tokens.keywords ^\s*(else|endif|export|ifdef|ifeq|ifndef|ifneq)
+lang.makefile.tokens.keywords.format cyan bold
+lang.makefile.indent.size 8
+lang.makefile.indent.auto true
+lang.makefile.indent.roundup true
+lang.makefile.indent.using_tabs true
+lang.makefile.indent.indenters ^(\S+:|ifdef|ifeq|ifndef|ifneq|else)
+lang.makefile.indent.unindenters ^(\S+:|endif)
+lang.makefile.indent.preventers (^\s*#.*)
+lang.makefile.indent.ignore ^\s*$
+
+lang.bind.bangmask ^(@|\$TTL|;.*(?:bind|BIND|Bind))
+lang.bind.format.default white bold
+lang.bind.format.selection inverse
+lang.bind.format.found yellow inverse
+lang.bind.tokens.comments (;.*)
+lang.bind.tokens.comments.format 8 bold
+lang.bind.comment_string "; "
+lang.bind.tokens.ttl \$TTL
+lang.bind.tokens.ttl.format yellow bold
+lang.bind.tokens.number \s(\d+)(?:[^0-9.mhdw]|$)
+lang.bind.tokens.number.format blue bold
+lang.bind.tokens.time \b(\d+)[mhdw]
+lang.bind.tokens.time.format red bold
+lang.bind.tokens.domain (?:[a-z][\w-]+\.)+[a-z][\w-]+\.?
+lang.bind.tokens.domain.format cyan bold
+lang.bind.tokens.ip4address \b\d+\.\d+\.\d+\.\d+\b
+lang.bind.tokens.ip4address.format cyan
+lang.bind.tokens.keywords1 \b(IN)\b
+lang.bind.tokens.keywords1.format white
+lang.bind.tokens.keywords2 \b(A|CNAME|MX|NS|SOA|TXT)\b
+lang.bind.tokens.keywords2.format yellow bold
+lang.bind.tokens.doublequoted_strings (\".*?[^\\]\"|\"\")
+lang.bind.tokens.doublequoted_strings.format green bold
+lang.bind.indent.size 8
+lang.bind.indent.auto true
+lang.bind.indent.roundup true
+lang.bind.indent.using_tabs false
+
+lang.markdown.filemask \.(?:md|markdown)
+lang.markdown.format.default white
+lang.markdown.format.selection inverse
+lang.markdown.format.found yellow inverse
+lang.markdown.tokens.title (^# .*)
+lang.markdown.tokens.title.format 8 bold
+lang.markdown.tokens.subtitle (^## .*)
+lang.markdown.tokens.subtitle.format cyan bold
+lang.markdown.tokens.subsubtitle (^###+ .*)
+lang.markdown.tokens.subsubtitle.format cyan
+lang.markdown.tokens.list_item ^\s*\*
+lang.markdown.tokens.list_item.format white bold
+lang.markdown.tokens.code ^(?: {4,}|\t)\s*.+
+lang.markdown.tokens.code.format yellow bold
+lang.markdown.indent.size 2
+lang.markdown.indent.auto true
+lang.markdown.indent.roundup true
+lang.markdown.wrap_margin 80
+
 
 # Custom configuration files can be included.
 # If a setting is specified again, it overrides the previous setting given
 # higher up in the configuration file(s).
 
-include ~/.diakonos/pistos.conf
+include ~/.diakonos/custom.conf
 
 # Uncomment this line if your terminal supports 256 colours.
 #include ~/.diakonos/diakonos-256-colour.conf