ver 2009.10.14 → 2009.11.28

data/bin/ver

@@ -1,19 +1,103 @@
 #!/usr/bin/env ruby
 
-if File.symlink?(__FILE__)
-  lib = File.expand_path('../../lib/ver', File.readlink(__FILE__))
-else
-  lib = File.expand_path('../../lib/ver', __FILE__)
+require 'pathname'
+require 'optparse'
+
+# annoying fixes
+class Pathname
+  alias / join
+
+  def cp(dest)
+    FileUtils.copy_file(expand_path.to_s, dest.to_s, preserve = true)
+  end
+
+  def =~(regexp)
+    to_s =~ regexp
+  end
 end
 
-if ARGV.delete('-f')
-  require lib
-  VER.run
-else
-  fork do
-    fork do
-      require lib
-      VER.run
+module VER
+  file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+  ROOT = File.expand_path('../../lib', file).encode(Encoding::UTF_8)
+
+  module_function
+
+  def require_and_run(options = {})
+    # TODO: remove before release
+    $LOAD_PATH.unshift(ROOT)
+
+    if options[:fork]
+      fork do
+        trap(:HUP){ 'terminal disconnected' }
+        require 'ver'
+        run(options)
+      end
+    else
+      require 'ver'
+      run(options)
     end
   end
+
+  def install_tm_bundle(path)
+    require File.join(ROOT, 'ver/plist')
+    require 'json'
+    require 'fileutils'
+
+    glob = File.expand_path('Syntaxes/*.{plist,tmLanguage}', path)
+
+    Dir.glob(glob, File::FNM_CASEFOLD) do |syntax|
+      plist = VER::Plist.parse_xml(syntax)
+      name = plist['name'].to_s.gsub(/[\/\u2014]/, '-')
+      puts "Installing #{name}"
+      target = File.expand_path("../config/syntax/#{name}.json", ROOT)
+      json = JSON.pretty_unparse(plist)
+      json.gsub!(/\\x\{(\h+)\}/, '\\\\x\1')
+
+      FileUtils.mkdir_p(File.dirname(target))
+      File.open(target, 'w+'){|io| io.write(json) }
+    end
+
+    info = Plist.parse_xml(File.join(path, 'info.plist'))
+    info_name = info['name']
+
+    glob = File.expand_path('Preferences/*.{plist,tmPreferences}', path)
+    preferences = {}
+
+    Dir.glob(glob, File::FNM_CASEFOLD) do |preference|
+      plist = Plist.parse_xml(preference)
+      name = plist['name'].to_s.gsub(/[\/\u2014]/, '-')
+      puts "Adding #{name}"
+      preferences[plist['uuid']] = plist
+    end
+
+    pref = File.expand_path("../config/preferences/#{info_name}.json", ROOT)
+    pref.gsub!(/[\/\u2014]/, '-')
+    FileUtils.mkdir_p(File.dirname(pref))
+    json = JSON.pretty_unparse(preferences)
+    puts "Writing to #{pref}"
+    File.open(pref, 'w+'){|io| io.write(json) }
+
+    exit
+  end
 end
+
+options = { fork: true }
+
+op = OptionParser.new{|o|
+  o.on('-Eex[:in]', '--encoding EXTERNAL[:INTERNAL]', 'used encoding'){|enc|
+    options[:encoding] = enc }
+  o.on('--font-family NAME', 'font family'){|fn| options[:font_family] = fn }
+  o.on('--font-size INT', 'font size'){|fs| options[:font_size] = fs }
+  o.on('-f', '--nofork', 'stay attached to terminal'){ options[:fork] = false }
+  o.on('-k', '--keymap NAME', 'vim or emacs'){|k| options[:keymap] = k }
+  o.separator ' '
+  o.on('--install-tm-bundle PATH',
+       'Install textmate bundle for use with VER',
+       &VER.method(:install_tm_bundle))
+  o.separator ' '
+  o.on('-h', '--help', 'Show this help'){ puts o; exit }
+  o.on('--debug', 'turn $DEBUG on'){ $DEBUG = true }
+}
+op.parse!(ARGV)
+
+VER.require_and_run(options)

data/config/detect.rb

@@ -5,26 +5,34 @@ module VER::Syntax::Detector
   exts "ASP vb.NET", ["vb"]
   exts "ASP", ["asa"]
   exts "ActionScript", ["as"]
+  exts "Active4D Config", ["ini"]
+  exts "Active4D Library", ["a4l"]
   exts "Ada", ["adb", "ads"]
+  exts "Ant", ["ant.xml", "build.xml"]
+  head "Ant", /<\!--\s*ant\s*-->/
   exts "Apache", ["conf", "htaccess"]
   exts "AppleScript", ["applescript", "script editor"]
   head "AppleScript", /^#!.*(osascript)/
   exts "BibTeX", ["bib"]
-  exts "Blog — HTML", ["blog.html"]
-  head "Blog — HTML", /^Type: Blog Post \(HTML\)/
-  exts "Blog — Markdown", ["blog.markdown", "blog.mdown", "blog.mkdn", "blog.md"]
-  head "Blog — Markdown", /^Type: Blog Post \(Markdown\)/
-  exts "Blog — Text", ["blog.txt"]
-  head "Blog — Text", /^Type: Blog Post \(Text\)/
-  exts "Blog — Textile", ["blog.textile"]
-  head "Blog — Textile", /^Type: Blog Post \(Textile\)/
-  exts "Bulletin Board", ["bbcode"]
+  exts "Bison", ["y"]
+  exts "Blog - HTML", ["blog.html"]
+  head "Blog - HTML", /^Type: Blog Post \(HTML\)/
+  exts "Blog - Markdown", ["blog.markdown", "blog.mdown", "blog.mkdn", "blog.md"]
+  head "Blog - Markdown", /^Type: Blog Post \(Markdown\)/
+  exts "Blog - Text", ["blog.txt"]
+  head "Blog - Text", /^Type: Blog Post \(Text\)/
+  exts "Blog - Textile", ["blog.textile"]
+  head "Blog - Textile", /^Type: Blog Post \(Textile\)/
   exts "C++", ["cc", "cpp", "cp", "cxx", "c++", "C", "h", "hh", "hpp", "h++"]
   head "C++", /-\*- C\+\+ -\*-/
   exts "C", ["c", "h"]
   head "C", /-[*]-( Mode:)? C -[*]-/
+  exts "CMake Listfile", ["CMakeLists.txt", "cmake"]
   exts "CSS", ["css", "css.erb"]
-  exts "Graphviz (DOT)", ["dot", "DOT"]
+  exts "CSV", ["csv"]
+  exts "ColdFusion", ["cfm", "cfml", "cfc"]
+  exts "D", ["d", "di"]
+  head "D", /^#!.*\bg?dmd\b./
   exts "Diff", ["diff", "patch"]
   head "Diff", /(?x)^
 		(===\ modified\ file
@@ -35,75 +43,119 @@ module VER::Syntax::Detector
 		|\d+(,\d+)* (a|d|c) \d+(,\d+)* $
 		|diff\ --git\ 
 		)/
+  head "DokuWiki", /^\s*={2,}(.*)={2,}\s*$/
+  exts "Doxygen", ["doxygen"]
   exts "Dylan", ["dylan"]
   exts "Eiffel", ["e"]
   exts "Erlang", ["erl", "hrl"]
   exts "F-Script", ["fscript"]
   exts "FXScript", ["fxscript"]
+  exts "Fortran - Modern", ["f90", "F90", "f95", "F95", "f03", "F03", "f08", "F08"]
+  head "Fortran - Modern", /(?i)-[*]- mode: f90 -[*]-/
+  exts "Fortran - Punchcard", ["f", "F", "f77", "F77", "for", "FOR", "fpp", "FPP"]
+  exts "GTD", ["gtd"]
+  exts "GTDalt", ["gtd", "gtdlog"]
+  exts "Gettext", ["po", "potx"]
+  exts "Go", ["go"]
+  exts "Graphviz (DOT)", ["dot", "DOT"]
+  exts "Greasemonkey", ["user.js"]
+  head "Greasemonkey", /\/\/ ==UserScript==/
   exts "Gri", ["gri"]
   head "Gri", /-[*]-( Mode:)? Gri -[*]-/
-  exts "HTML (Mason)", ["mhtml", "autohandler", "dhandler", "md", "mc"]
-  exts "HTML (Rails)", ["rhtml", "erb", "html.erb"]
-  exts "HTML (Tcl)", ["tcl", "adp", "inc"]
-  exts "HTML (ASP.net)", ["aspx", "ascx"]
   exts "HTML (ASP)", ["asp"]
+  exts "HTML (ASP.net)", ["aspx", "ascx"]
+  exts "HTML (Active4D)", ["a4d", "a4p"]
+  exts "HTML (Erlang)", ["yaws"]
+  exts "HTML (Tcl)", ["tcl", "adp", "inc"]
   exts "HTML", ["html", "htm", "shtml", "xhtml", "phtml", "php", "inc", "tmpl", "tpl", "ctp"]
   head "HTML", /<!DOCTYPE|<(?i:html)|<\?(?i:php)/
   exts "Haskell", ["hs"]
   exts "Inform", ["inf"]
   exts "Ini", ["ini", "conf"]
+  exts "Installer Distribution Script", ["dist"]
   exts "Io", ["io"]
-  exts "Java", ["java", "bsh"]
+  exts "JSON", ["json"]
   exts "Java Properties", ["properties"]
+  exts "Java Server Page (JSP)", ["jsp"]
+  exts "Java", ["java", "bsh"]
   exts "JavaScript", ["js", "htc", "jsx"]
   head "LaTeX Beamer", /^\\documentclass(\[.*\])?\{beamer\}/
   head "LaTeX Log", /This is (pdf|pdfe)?TeXk?, Version/
+  head "LaTeX Memoir", /^\\documentclass(\[.*\])?\{memoir\}/
   exts "LaTeX", ["tex"]
   head "LaTeX", /^\\documentclass(?!.*\{beamer\})/
+  exts "Lex-Flex", ["l"]
+  exts "LilyPond", ["ly", "lily", "ily"]
   exts "Lisp", ["lisp", "cl", "l", "mud", "el"]
   exts "Literate Haskell", ["lhs"]
   exts "Logtalk", ["lgt", "config"]
   exts "Lua", ["lua"]
   exts "MEL", ["as"]
   exts "MIPS Assembler", ["s", "mips", "spim", "asm"]
+  exts "MacPorts Portfile", ["Portfile"]
   exts "Mail", ["mail"]
   head "Mail", /^From: .*(?=\w+@[\w-]+\.\w+)/
   exts "Makefile", ["GNUmakefile", "makefile", "Makefile", "OCamlMakefile"]
   exts "Markdown", ["mdown", "markdown", "markdn", "md"]
+  exts "Maven POM", ["pom.xml"]
+  exts "Mediawiki", ["mediawiki", "wikipedia", "wiki"]
   exts "Modula-3", ["m3", "cm3"]
-  exts "Movable Type", ["mtml"]
-  head "Movable Type", /<\$?[Mm][Tt]/
+  exts "MoinMoin", ["moinmoin"]
+  head "MultiMarkdown", /^Format:\s*(?i:complete)\s*$/
+  exts "Nemerle", ["n"]
   exts "OCaml", ["ml", "mli"]
+  exts "OCamllex", ["mll"]
+  exts "OCamlyacc", ["mly"]
   exts "Objective-C++", ["mm", "M", "h"]
+  exts "Objective-C", ["m", "h"]
   head "PHP", /^#!.*(?<!-)php[0-9]{0,1}\b/
   exts "Pascal", ["pas", "p"]
   exts "Perl", ["pl", "pm", "pod", "t", "PL"]
   head "Perl", /^#!.*\bperl\b/
   exts "Plain Text", ["txt"]
+  exts "PmWiki", ["pmwiki"]
+  exts "Postscript", ["ps", "eps"]
+  head "Postscript", /^%!PS/
   exts "Processing", ["pde"]
+  exts "Python", ["py", "rpy", "pyw", "cpy", "SConstruct", "Sconstruct", "sconstruct", "SConscript"]
+  head "Python", /^#!\/.*\bpython\b/
   exts "Quake Style .cfg", ["cfg"]
   exts "R", ["R", "r", "s", "S", "Rprofile"]
+  exts "Ragel", ["rl", "ragel"]
+  exts "Rd (R Documentation)", ["rd", "Rd"]
+  exts "Regular Expressions (Oniguruma)", ["re"]
+  exts "Regular Expressions (Python)", ["re"]
+  exts "Release Notes", ["tmReleaseNotes"]
+  exts "Remind", ["defs.rem", "REM*.txt", ".reminders"]
+  head "Remind", /^REM*/
   exts "Rez", ["r"]
-  exts "Ruby on Rails", ["rxml", "builder"]
   exts "Ruby", ["rb", "rbx", "rjs", "Rakefile", "rake", "cgi", "fcgi", "gemspec", "irbrc", "capfile"]
   head "Ruby", /^#!\/.*\bruby\b/
-  exts "SQL (Rails)", ["erbsql", "sql.erb"]
+  exts "S5 Slide Show", ["s5"]
   exts "SQL", ["sql", "ddl", "dml"]
+  exts "SSH Config", ["ssh_config", ".ssh/config", "sshd_config"]
   exts "SWIG", ["i", "swg"]
+  exts "SWeave", ["Snw", "Rnw", "snw", "rnw"]
   exts "Scheme", ["scm", "sch"]
+  exts "Scilab", ["sce", "sci", "tst", "dem"]
+  exts "Setext", ["etx", "etx.txt"]
+  head "Setext", /setext/
   exts "Shell Script (Bash)", ["sh", "ss", "bashrc", "bash_profile", "bash_login", "profile", "bash_logout", ".textmate_init"]
   head "Shell Script (Bash)", /^#!.*(bash|zsh|sh|tcsh)/
   exts "Slate", ["slate"]
-  exts "Standard ML", ["sml", "sig"]
-  exts "svn-commit.tmp", ["svn-commit.tmp", "svn-commit.2.tmp"]
+  exts "Strings File", ["strings"]
+  exts "TSV", ["tsv"]
   exts "Tcl", ["tcl"]
   exts "TeX", ["sty", "cls"]
   exts "Textile", ["textile"]
   head "Textile", /textile/
+  exts "Thrift", ["thrift"]
+  exts "Txt2tags", ["t2t"]
   exts "Vectorscript", ["vss"]
   exts "XML", ["xml", "tld", "jsp", "pt", "cpt", "dtml", "rss", "opml"]
   exts "XSL", ["xsl", "xslt"]
   exts "YAML", ["yaml", "yml"]
   exts "iCalendar", ["ics", "ifb"]
   exts "reStructuredText", ["rst", "rest"]
+  exts "svn-commit.tmp", ["svn-commit.tmp", "svn-commit.2.tmp"]
 end

data/config/keymap/emacs.rb

@@ -0,0 +1,66 @@
+module VER
+  class Keymap
+    def self.emacs(options)
+      emacs = new(options)
+      emacs.mode = options.fetch(:mode, :basic)
+
+      emacs.add_mode :quirks do |mode|
+        mode.arguments = false
+
+     		# TODO
+        mode.map :universal_argument,   %w[Control-u]
+        mode.map :keyboard_quit,        %w[Control-g]
+      end
+
+      emacs.add_mode :basic do |mode|
+        mode.inherits :quirks
+        mode.arguments = false
+        mode.missing :insert_string
+
+        mode.map :quit,                   %w[Control-x Control-c]
+        mode.map :go_page_down,           %w[Control-v], %w[Next]
+        mode.map :go_page_up,             %w[Alt-v], %w[Prior]
+        mode.map :go_line_up,             %w[Control-p], %w[Up]
+        mode.map :go_line_down,           %w[Control-n], %w[Down]
+        mode.map :go_char_left,           %w[Control-b], %w[Left]
+        mode.map :go_char_right,          %w[Control-f], %w[Right]
+        mode.map :go_word_left,           %w[Alt-b]
+        mode.map :go_word_right,          %w[Alt-f]
+        mode.map :go_beginning_of_line,   %w[Control-a]
+        mode.map :go_end_of_line,         %w[Control-e]
+        mode.map :go_line,                %w[Control-less]
+        mode.map :go_end_of_file,         %w[Control-greater]
+        mode.map :undo,                   %w[Control-slash], %w[Undo]
+        mode.map :redo,                   %w[Redo]
+        mode.map :join_lines,             %w[Control-j]
+        mode.map :insert_newline,         %w[Return]
+        mode.map :delete_char_left,       %w[BackSpace]
+        mode.map :delete_char_right,      %w[Control-d], %w[Delete]
+        mode.map :delete_to_eol,          %w[Control-k]
+        mode.map :delete_sentence,        %w[Alt-k]
+        mode.map :delete_word_right,      %w[Alt-d]
+        mode.map :delete_word_left,       %w[Alt-BackSpace]
+
+        # HACK, this probably shouldn't switch modes.
+        mode.map [:start_selection, :block], %w[Control-space]
+
+        KEYSYMS.each do |sym, name|
+          mode.map [:insert_string, sym], [name]
+        end
+
+        # TODO
+        mode.map :recenter_top_bottom, %w[Control-l]
+        mode.map :go_beginning_of_sentence, %w[Alt-a]
+        mode.map :go_end_of_sentence, %w[Alt-e]
+        mode.map :kill_region,          %w[Control-w]
+
+        mode.map :describe_key_briefly, %w[Control-h c]
+        mode.map :describe_key,         %w[Control-h k]
+        mode.map :describe_function,    %w[Control-h f]
+        mode.map :apropos_command,      %w[Control-h a]
+      end
+
+      emacs
+    end
+  end
+end

data/config/keymap/vim.rb

@@ -12,33 +12,55 @@ module VER
         mode.map :file_save_popup,    %w[Control-Alt-s]
         mode.map :quit,               %w[Control-q]
         mode.map :start_control_mode, %w[Escape], %w[Control-c]
+        mode.map :open_method_list,   %w[F10]
+        mode.map :open_terminal,      %w[F9]
+        mode.map :open_grep_list,     %w[Alt-g], %w[Control-m g]
+        mode.map :describe_key,       %w[Control-h k]
+        mode.map :help_for_help,      %w[Control-h question], %w[F1], %w[Help]
+        mode.map :tags_at,            %w[Control-g t]
 
         mode.map :buffer_switch, %w[Alt-b], %w[Control-m b]
         mode.map :window_switch, %w[Alt-B], %w[Control-m B]
+        mode.map :open_console,  %w[Control-exclam]
       end
 
       vim.add_mode :views do |mode|
-        mode.map :view_create,     %w[Control-w Control-c]
-        mode.map :view_focus_next, %w[Control-w Control-j]
-        mode.map :view_focus_prev, %w[Control-w Control-k]
-        mode.map :view_close,      %w[Control-w Control-w]
+        mode.map :view_one,         %w[Control-w KeyPress-1]
+        mode.map :view_two,         %w[Control-w KeyPress-2]
+
+        mode.map :view_slave_inc,   %w[Control-w plus]
+        mode.map :view_slave_dec,   %w[Control-w minus]
+
+        mode.map :view_master_inc,  %w[Control-w H]
+        mode.map :view_master_dec,  %w[Control-w L]
+
+        mode.map :view_create,      %w[Control-w c]
+        mode.map :view_focus_next,  %w[Control-w j]
+        mode.map :view_focus_prev,  %w[Control-w k]
+        mode.map :view_push_down,   %w[Control-w J]
+        mode.map :view_push_up,     %w[Control-w K]
+        mode.map :view_close,       %w[Control-w w]
+        mode.map :view_push_top,    %w[Control-w Return]
+        mode.map :view_push_bottom, %w[Control-w BackSpace]
       end
 
       vim.add_mode :move do |mode|
-        mode.map :go_beginning_of_line, %w[0]
-        mode.map :go_char_left,         %w[h], %w[Left]
-        mode.map :go_char_right,        %w[l], %w[Right]
-        mode.map :go_end_of_file,       %w[G]
-        mode.map :go_end_of_line,       %w[dollar]
-        mode.map :go_line,              %w[g g]
-        mode.map :go_line_down,         %w[j], %w[Down]
-        mode.map :go_line_up,           %w[k], %w[Up]
-        mode.map :go_next_newline_block, %w[braceleft]
-        mode.map :go_page_down,         %w[Control-f], %w[Next]
-        mode.map :go_page_up,           %w[Control-b], %w[Prior]
-        mode.map :go_prev_newline_block, %w[braceright]
-        mode.map :go_word_left,         %w[b]
-        mode.map :go_word_right,        %w[w]
+        mode.map :beginning_of_line,      %w[KeyPress-0], %w[Home]
+        mode.map :backward_char,          %w[h], %w[Left]
+        mode.map :forward_char,           %w[l], %w[Right]
+        mode.map :end_of_file,            %w[G]
+        mode.map :end_of_line,            %w[dollar], %w[End]
+        mode.map :go_line,                %w[g g]
+        mode.map :next_line,              %w[j], %w[Down], %w[Control-n]
+        mode.map :previous_line,          %w[k], %w[Up], %w[Control-p]
+        mode.map :next_newline_block,     %w[braceleft]
+        mode.map :page_down,              %w[Control-f], %w[Next]
+        mode.map :page_up,                %w[Control-b], %w[Prior]
+        mode.map :prev_newline_block,     %w[braceright]
+        mode.map :backward_word,          %w[b], %w[Shift-Left]
+        mode.map :forward_word,           %w[w], %w[Shift-Right]
+        mode.map :word_right_end,         %w[e]
+        mode.map :matching_brace,         %w[percent]
       end
 
       vim.add_mode :search do |mode|
@@ -46,44 +68,69 @@ module VER
         mode.map :search_next_word_under_cursor, %w[asterisk]
         mode.map :search_prev,                   %w[N]
         mode.map :search_prev_word_under_cursor, %w[numbersign]
-        mode.map :status_search,                 %w[slash]
+        mode.map :status_search_next,            %w[slash]
+        mode.map :status_search_prev,            %w[question]
+        mode.map :search_char_right,             %w[f]
+        mode.map :search_char_left,              %w[F]
+      end
+
+      vim.add_mode :ctags do |mode|
+        mode.map :ctags_find_current, %w[Control-bracketright] # C-]
+      end
+
+      vim.add_mode :complete do |mode|
+        mode.arguments = false
+
+        mode.to :complete_file,   %w[Control-x Control-f]
+        mode.to :complete_line,   %w[Control-x Control-l]
+        mode.to :complete_word,   %w[Control-x Control-w]
+        mode.to :complete_aspell, %w[Control-x Control-a]
+        mode.to :complete_tm,     %w[Control-x Control-x]
+        mode.to :smart_tab,       %w[Tab]
       end
 
       vim.add_mode :control do |mode|
-        mode.inherits :basic, :move, :views, :search
-
-        mode.map :copy_left_word,                %w[y b]
-        mode.map :copy_line,                     %w[y y], %w[Y]
-        mode.map :copy_right_word,               %w[y w]
-        mode.map :delete_char_left,              %w[X]
-        mode.map :delete_char_right,             %w[x]
-        mode.map :delete_line,                   %w[d d]
-        mode.map :delete_to_eol,                 %w[D]
-        mode.map :delete_to_eol_then_insert,     %w[C]
-        mode.map :delete_word_left,              %w[d b]
-        mode.map :delete_word_right,             %w[d w]
-        mode.map :eol_then_insert_mode,          %w[A]
-        mode.map :indent_line,                   %w[greater]
-        mode.map :insert_indented_newline_above, %w[O]
-        mode.map :insert_indented_newline_below, %w[o]
-        mode.map :join_lines,                    %w[J]
-        mode.map :paste,                         %w[p]
-        mode.map :redo,                          %w[Control-r]
-        mode.map :smart_evaluate,                %w[Alt-e], %w[Control-m e]
-        mode.map :sol_then_insert_mode,          %w[I]
-        mode.map :start_insert_mode,             %w[i]
-        mode.map :start_replace_mode,            %w[R]
-        mode.map :start_select_block_mode,       %w[Control-v]
-        mode.map :start_select_char_mode,        %w[v]
-        mode.map :start_select_line_mode,        %w[V]
-        mode.map :undo,                          %w[u]
-        mode.map :unindent_line,                 %w[less]
-        mode.map :replace_char,                  %w[r]
-        mode.map :status_theme_select,           %w[Alt-t], %w[Control-m t]
-        mode.map :theme_switch,                  %w[Control-t]
-        mode.map :syntax_switch,                 %w[Control-y]
-
-        mode.missing :ignore_string
+        mode.inherits :basic, :move, :views, :search, :ctags
+
+        mode.map :copy_left_word,                  %w[y b]
+        mode.map :copy_line,                       %w[y y], %w[Y]
+        mode.map :copy_right_word,                 %w[y w]
+        mode.map :delete_line,                     %w[d d]
+        mode.map :change_line,                     %w[c c]
+        mode.map [:delete_motion, :backward_char], %w[X]
+        mode.map [:delete_motion, :forward_char],  %w[x]
+        mode.map [:delete_motion, :end_of_line],   %w[D]
+        mode.map [:change_motion, :end_of_line],   %w[C]
+
+        mode.map :change_motion,                   ['c', :move]
+        mode.map :delete_motion,                   ['d', :move]
+
+        mode.map :eol_then_insert_mode,            %w[A]
+        mode.map :forward_char_then_insert_mode,   %w[a]
+
+        mode.map :indent_line,                     %w[greater]
+        mode.map :insert_indented_newline_above,   %w[O]
+        mode.map :insert_indented_newline_below,   %w[o]
+        mode.map :join_lines,                      %w[J]
+        mode.map :paste,                           %w[p]
+        mode.map :redo,                            %w[Control-r]
+        mode.map :replace_char,                    %w[r]
+        mode.map :smart_evaluate,                  %w[Alt-e], %w[Control-m e]
+        mode.map :sol_then_insert_mode,            %w[I]
+        mode.map :start_insert_mode,               %w[i]
+        mode.map :start_replace_mode,              %w[R]
+        mode.map :start_select_block_mode,         %w[Control-v]
+        mode.map :start_select_char_mode,          %w[v]
+        mode.map :start_select_line_mode,          %w[V]
+        mode.map :status_theme_select,             %w[Alt-t], %w[Control-m t]
+        mode.map :syntax_switch,                   %w[Control-y]
+        mode.map :theme_switch,                    %w[Control-t]
+        mode.map :undo,                            %w[u]
+        mode.map :unindent_line,                   %w[less]
+        mode.map :wrap_line,                       %w[g w]
+        mode.map :preview,                         %w[F5]
+        mode.map :status_ex,                       %w[colon]
+        mode.map :syntax_indent_file,              %w[equal]
       end
 
       vim.add_mode :replace do |mode|
@@ -93,76 +140,39 @@ module VER
       vim.add_mode :readline do |mode|
         mode.arguments = false
 
-        mode.map :delete_char_left,        %w[BackSpace]
-        mode.map :delete_char_right,       %w[Delete]
-        mode.map :go_char_left,            %w[Left]
-        mode.map :go_char_right,           %w[Right]
-        mode.map :go_word_left,            %w[Shift-Left]
-        mode.map :go_word_right,           %w[Shift-Right]
-
-        # Map Tk keysyms
-        { " "  => "space",
-          "!"  => "exclam",
-          '"'  => "quotedbl",
-          "#"  => "numbersign",
-          "$"  => "dollar",
-          "%"  => "percent",
-          "&"  => "ampersand",
-          "'"  => "quoteright",
-          "("  => "parenleft",
-          ")"  => "parenright",
-          "*"  => "asterisk",
-          "+"  => "plus",
-          ","  => "comma",
-          "-"  => "minus",
-          "."  => "period",
-          "/"  => "slash",
-          "0"  => "0",
-          "1"  => "1",
-          "2"  => "2",
-          "3"  => "3",
-          "4"  => "4",
-          "5"  => "5",
-          "6"  => "6",
-          "7"  => "7",
-          "8"  => "8",
-          "9"  => "9",
-          ":"  => "colon",
-          ";"  => "semicolon",
-          "<"  => "less",
-          "="  => "equal",
-          ">"  => "greater",
-          "?"  => "question",
-          "@"  => "at",
-          "["  => "bracketleft",
-          "\\" => "backslash",
-          "]"  => "bracketright",
-          "^"  => "asciicircum",
-          "_"  => "underscore",
-          "`"  => "quoteleft",
-          "{"  => "braceleft",
-          "|"  => "bar",
-          "}"  => "braceright",
-          "~"  => "asciitilde",
-        }.each do |sym, name|
+        mode.map [:delete_motion, :backward_char], %w[BackSpace]
+        mode.map [:delete_motion, :forward_char],  %w[Delete], %w[Control-d]
+        mode.map [:delete_motion, :backward_word], %w[Control-w]
+        mode.map :backward_char,                   %w[Left], %w[Control-b]
+        mode.map :forward_char,                    %w[Right], %w[Control-f]
+        mode.map :backward_word,                   %w[Shift-Left], %w[Alt-b]
+        mode.map :forward_word,                    %w[Shift-Right], %w[Alt-f]
+        mode.map :beginning_of_line,               %w[Home], %w[Control-a]
+        mode.map :end_of_line,                     %w[End], %w[Control-e]
+        mode.map :insert_selection,                %w[Shift-Insert]
+        mode.map :accept_line,                     %w[Return]
+        mode.map :previous_history,                %w[Up], %w[Control-p]
+        mode.map :next_history,                    %w[Down], %w[Control-n]
+        mode.map :beginning_of_history,            %w[Control-less]
+        mode.map :end_of_history,                  %w[Control-greater]
+        mode.map :transpose_chars,                 %w[Control-t]
+        mode.map :insert_tab,                      %w[Control-v Tab]
+
+        KEYSYMS.each do |sym, name|
           mode.map [:insert_string, sym], [name]
         end
       end
 
       vim.add_mode :insert do |mode|
-        mode.inherits :basic, :views, :readline
+        mode.inherits :basic, :views, :complete, :readline
         mode.arguments = false
 
-        mode.map :go_line_down,            %w[Down]
-        mode.map :go_line_up,              %w[Up]
-        mode.map :go_page_down,            %w[Control-f], %w[Next]
-        mode.map :go_page_down,            %w[Shift-Down]
-        mode.map :go_page_up,              %w[Control-b], %w[Prior]
-        mode.map :go_page_up,              %w[Shift-Up]
+        mode.map :next_line,               %w[Down], %w[Control-n]
+        mode.map :previous_line,           %w[Up], %w[Control-p]
+        mode.map :page_down,               %w[Control-f], %w[Next], %w[Shift-Down]
+        mode.map :page_up,                 %w[Control-b], %w[Prior], %w[Shift-Up]
         mode.map :insert_indented_newline, %w[Return]
         mode.map :smart_evaluate,          %w[Alt-e], %w[Control-e]
-        mode.map :complete_aspell,         %w[Control-x Control-a]
-        mode.map :complete_file,           %w[Control-x Control-f]
 
         mode.missing :insert_string
       end
@@ -170,17 +180,21 @@ module VER
       vim.add_mode :select do |mode|
         mode.inherits :basic, :move, :search
 
-        mode.map :copy_selection, %w[y], %w[Y]
-        mode.map :delete_selection, %w[d], %w[D], %w[x], %w[BackSpace], %w[Delete]
-        mode.map :indent_selection, %w[greater]
-        mode.map :pipe_selection, %w[exclam]
-        mode.map :smart_evaluate, %w[Alt-e], %w[Control-e]
-        mode.map :switch_select_block_mode, %w[Control-v]
-        mode.map :switch_select_char_mode,  %w[v]
-        mode.map :switch_select_line_mode,  %w[V]
-        mode.map :unindent_selection, %w[less]
-        mode.map :comment_selection, %w[comma c]
-        mode.map :uncomment_selection, %w[comma u]
+        mode.map :copy_selection,               %w[y], %w[Y]
+        mode.map :delete_selection,             %w[d], %w[D], %w[x], %w[BackSpace], %w[Delete]
+        mode.map :indent_selection,             %w[greater]
+        mode.map :pipe_selection,               %w[exclam]
+        mode.map :smart_evaluate,               %w[Alt-e], %w[Control-e]
+        mode.map :switch_select_block_mode,     %w[Control-v]
+        mode.map :switch_select_char_mode,      %w[v]
+        mode.map :switch_select_line_mode,      %w[V]
+        mode.map :unindent_selection,           %w[less]
+        mode.map :comment_selection,            %w[comma c]
+        mode.map :uncomment_selection,          %w[comma u]
+        mode.map :wrap_selection,               %w[g w]
+        mode.map :selection_replace_char,       %w[r]
+        mode.map :selection_replace_string,     %w[c]
+        mode.map [:finish_selection, :control], %w[Escape], %w[Control-c]
       end
 
       vim.add_mode :select_char do |mode|
@@ -195,19 +209,14 @@ module VER
         mode.inherits :select
       end
 
-      vim.add_mode :complete do |mode|
-        mode.inherits :basic
-
-        mode.to :complete_file, %w[Control-x Control-f]
-        mode.to :complete_line, %w[Control-x Control-l]
-        mode.to :complete_omni, %w[Control-x Control-o]
-        mode.to :complete_word, %w[Control-x Control-i]
-      end
-
       vim.add_mode :status_query do |mode|
         mode.inherits :basic, :readline
+        mode.arguments = false
 
-        mode.to :ask_abort, %w[Escape], %w[Control-c]
+        mode.to :ask_abort,  %w[Escape], %w[Control-c]
+        mode.to :history_prev, %w[Up], %w[Control-p]
+        mode.to :history_next, %w[Down], %w[Control-n]
+        mode.to :history_complete, %w[Tab]
         mode.to :ask_submit, %w[Return]
 
         mode.missing :insert_string
@@ -215,12 +224,14 @@ module VER
 
       vim.add_mode :list_view_entry do |mode|
         mode.inherits :basic, :readline
+        mode.arguments = false
 
         # mode.to :update, %w[Key]
         mode.to :pick_selection, %w[Return]
         mode.to :cancel,         %w[Escape], %w[Control-c]
-        mode.to :go_line_up,     %w[Up]
-        mode.to :go_line_down,   %w[Down]
+        mode.to :line_up,        %w[Up]
+        mode.to :line_down,      %w[Down]
+        mode.to :completion,     %w[Tab]
 
         mode.missing :insert_string
       end
@@ -228,9 +239,108 @@ module VER
       vim.add_mode :list_view_list do |mode|
         mode.inherits :basic
 
-        mode.to :pick_selection, %w[Double-Button-1]
-        mode.to :go_line_up,     %w[Up]
-        mode.to :go_line_down,   %w[Down]
+        mode.to :pick_selection, %w[Return], %w[Double-Button-1]
+        mode.to :line_up,        %w[Up]
+        mode.to :line_down,      %w[Down]
+      end
+
+      vim.add_mode :hover_completion do |mode|
+        mode.inherits :basic
+
+        mode.to :go_up,               %w[Up], %w[k]
+        mode.to :go_down,             %w[Down], %w[j]
+        mode.to :continue_completion, %w[Right], %w[l]
+        mode.to :submit,              %w[Return]
+        mode.to :cancel,              %w[Escape], %w[BackSpace]
+      end
+
+      vim.add_mode :console_entry do |mode|
+        mode.inherits :basic, :readline
+        mode.arguments = false
+
+#        mode.to :execute,      %w[Return]
+#        mode.to :cancel,       %w[Escape], %w[Control-c]
+#        mode.to :history_up,   %w[Up]
+#        mode.to :history_down, %w[Down]
+
+         mode.to :vi_eof_maybe,           %w[Control-d]
+         mode.to :emacs_editing_mode,     %w[Control-e]
+         mode.to :abort,                  %w[Control-g]
+         mode.to :backward_char,          %w[Control-h]
+         mode.to :accept_line,            %w[Control-j], %w[Control-m]
+         mode.to :kill_line,              %w[Control-k]
+         mode.to :clear_screen,           %w[Control-l]
+         mode.to :next_history,           %w[Control-n]
+         mode.to :previous_history,       %w[Control-p], %w[minus]
+         mode.to :quoted_insert,          %w[Control-o], %w[Control-V]
+         mode.to :reverse_search_history, %w[Control-r]
+         mode.to :forward_search_history, %w[Control-s]
+         mode.to :transpose_chars,        %w[Control-t]
+         mode.to :unix_line_discard,      %w[Control-u]
+         mode.to :unix_word_rubout,       %w[Control-w]
+         mode.to :yank,                   %w[Control-y]
+         mode.to :vi_undo,                %w[Control-underscore]
+         mode.to :forwad_char,            %w[space]
+         mode.to :insert_comment,         %w[numbersign]
+         mode.to :end_of_line,            %w[dollar]
+         mode.to :vi_match,               %w[percent]
+         mode.to :vi_tilde_expand,        %w[ampersand]
+         mode.to :vi_complete,            %w[asterisk]
+         mode.to :next_history,           %w[plus]
+         mode.to :vi_char_search,         %w[comma]
+         mode.to :vi_redo,                %w[period]
+         mode.to :vi_search,              %w[numbersign]
+         mode.to :beginning_of_line,      %w[KeyPress-0]
+         mode.to :vi_char_search,         %w[semicolon]
+         mode.to :vi_complete,            %w[equal]
+         mode.to :vi_search,              %w[question]
+         mode.to :vi_append_eol,          %w[A]
+         mode.to :vi_prev_word,           %w[B]
+         mode.to :vi_change_to,           %w[C]
+         mode.to :vi_delete_to,           %w[D]
+         mode.to :vi_end_word,            %w[E]
+         mode.to :vi_char_search,         %w[F]
+         mode.to :vi_fetch_history,       %w[G]
+         mode.to :vi_insert_beg,          %w[I]
+         mode.to :vi_search_again,        %w[N]
+         mode.to :vi_put,                 %w[P]
+         mode.to :vi_replace,             %w[R]
+         mode.to :vi_subst,               %w[S]
+         mode.to :vi_char_search,         %w[T]
+         mode.to :revert_line,            %w[U]
+         mode.to :vi_next_word,           %w[W]
+         mode.to :backward_delete_char,   %w[X]
+         mode.to :vi_yank_to,             %w[Y]
+         mode.to :vi_complete,            %w[backslash]
+         mode.to :vi_first_print,         %w[asciicircum]
+         mode.to :vi_yank_arg,            %w[underscore]
+         mode.to :vi_goto_mark,           %w[quoteleft]
+         mode.to :vi_append_mode,         %w[a]
+         mode.to :vi_prev_word,           %w[b]
+         mode.to :vi_change_to,           %w[c]
+         mode.to :vi_delete_to,           %w[d]
+         mode.to :vi_end_word,            %w[e]
+         mode.to :vi_char_search,         %w[f]
+         mode.to :backward_char,          %w[h]
+         mode.to :vi_insertion_mode,      %w[i]
+         mode.to :next_history,           %w[j]
+         mode.to :prev_history,           %w[k]
+         mode.to :forward_char,           %w[l]
+         mode.to :forward_char,           %w[l]
+         mode.to :vi_set_mark,            %w[m]
+         mode.to :vi_search_again,        %w[n]
+         mode.to :vi_put,                 %w[p]
+         mode.to :vi_change_char,         %w[r]
+         mode.to :vi_subst,               %w[s]
+         mode.to :vi_char_search,         %w[t]
+         mode.to :vi_undo,                %w[u]
+         mode.to :vi_next_word,           %w[w]
+         mode.to :vi_delete,              %w[x]
+         mode.to :vi_yank_to,             %w[y]
+         mode.to :vi_column,              %w[bar]
+         mode.to :vi_change_case,         %w[asciitilde]
+
+        mode.missing :insert_string
       end
 
       vim