ver 2009.11.29 → 2009.12.14

data/Rakefile

@@ -10,7 +10,8 @@ PROJECT_README = 'README.textile'
 PROJECT_VERSION = ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')
 
 DEPENDENCIES = {
-  'ffi-tk' => {:version => '2009.11.29'},
+  'ffi-tk'       => {:version => '2009.12.14'},
+  'eventmachine' => {:version => '0.12.10'},
 }
 
 GEMSPEC = Gem::Specification.new{|s|

data/bin/ver

@@ -26,16 +26,8 @@ module VER
     # 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
+    require 'ver'
+    run(options)
   end
 
   def install_tm_bundle(path)
@@ -86,8 +78,7 @@ 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('--font FONT', 'font family'){|fn| options[:font] = fn }
   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 ' '

data/config/detect.rb

@@ -66,7 +66,7 @@ module VER::Syntax::Detector
   exts "HTML (ASP.net)", ["aspx", "ascx"]
   exts "HTML (Active4D)", ["a4d", "a4p"]
   exts "HTML (Erlang)", ["yaws"]
-  exts "HTML (Tcl)", ["tcl", "adp", "inc"]
+  exts "HTML (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"]

data/config/keymap/diakonos.rb

@@ -0,0 +1,181 @@
+module VER
+  class Keymap
+    def self.diakonos(options)
+      diakonos = new(options)
+      diakonos.mode = options.fetch(:mode, :buffer)
+      diakonos.arguments = false
+
+      diakonos.in_mode :basic do
+        key :quit, %w[Control-q]
+      end
+
+      diakonos.in_mode :buffers do
+        key :view_close, %w[Control-w]
+
+        1.upto(9) do |n|
+          key [:view_focus, n], ["Alt-#{n}"], ["Escape", n.to_s]
+        end
+      end
+
+      diakonos.in_mode :readline do
+        key [:kill_motion, :backward_char],   %w[BackSpace]
+        key [:kill_motion, :forward_char],    %w[Delete], %w[Control-d]
+        key [:kill_motion, :backward_word],   %w[Control-w]
+        key :backward_char,                   %w[Left], %w[Control-b]
+        key :forward_char,                    %w[Right], %w[Control-f]
+        key :backward_word,                   %w[Shift-Left], %w[Alt-b]
+        key :forward_word,                    %w[Shift-Right], %w[Alt-f]
+        key :beginning_of_line,               %w[Home], %w[Control-a]
+        key :end_of_line,                     %w[End], %w[Control-e]
+        key :insert_selection,                %w[Shift-Insert]
+        key :accept_line,                     %w[Return]
+        key :previous_history,                %w[Up], %w[Control-p]
+        key :next_history,                    %w[Down], %w[Control-n]
+        key :beginning_of_history,            %w[Control-less]
+        key :end_of_history,                  %w[Control-greater]
+        key :transpose_chars,                 %w[Control-t]
+        key :insert_tab,                      %w[Control-v Tab]
+
+        KEYSYMS.each do |sym, name|
+          key [:insert_string, sym], [name]
+        end
+      end
+
+      diakonos.in_mode :status_query do
+        inherits :basic, :readline
+
+        key :ask_abort,        %w[Escape], %w[Control-c]
+        key :history_prev,     %w[Up], %w[Control-p]
+        key :history_next,     %w[Down], %w[Control-n]
+        key :history_complete, %w[Tab]
+        key :ask_submit,       %w[Return]
+
+        missing :insert_string
+      end
+
+      diakonos.in_mode :bookmark do
+        key :bookmark_toggle, %w[Alt-b Alt-b]
+        key :next_bookmark,   %w[Alt-b Alt-n]
+        key :prev_bookmark,   %w[Alt-b Alt-p]
+
+        key :named_bookmark_add,    %w[Alt-b Alt-a]
+        key :named_bookmark_remove, %w[Alt-b Alt-r]
+        key :named_bookmark_visit,  %w[Alt-b Alt-g]
+
+        # these are only valid on US keymap, don't know a better way.
+        key [:named_bookmark_add, '1'], %w[Alt-b Alt-exclam]
+        key [:named_bookmark_add, '2'], %w[Alt-b Alt-at]
+        key [:named_bookmark_add, '3'], %w[Alt-b Alt-numbersign]
+        key [:named_bookmark_add, '4'], %w[Alt-b Alt-dollar]
+        key [:named_bookmark_add, '5'], %w[Alt-b Alt-percent]
+
+        key [:named_bookmark_visit, '1'], %w[Alt-b Alt-1]
+        key [:named_bookmark_visit, '2'], %w[Alt-b Alt-2]
+        key [:named_bookmark_visit, '3'], %w[Alt-b Alt-3]
+        key [:named_bookmark_visit, '4'], %w[Alt-b Alt-4]
+        key [:named_bookmark_visit, '5'], %w[Alt-b Alt-5]
+      end
+
+      diakonos.in_mode :ctags do
+        key :ctags_go,           %w[Alt-t]
+        key :ctags_find_current, %w[Alt-parenright]
+        key :ctags_prev,         %w[Alt-parenleft]
+      end
+
+      diakonos.in_mode :search do
+        key :status_search_next, %w[Control-f]
+        key :search_next,        %w[F3]
+        key :search_clear,       %w[Control-Alt-u]
+
+        # TODO: this doesn't work, investiate.
+        key :search_prev,        %w[Shift-F3]
+      end
+
+      diakonos.in_mode :select do
+        key :start_select_char_mode, %w[Control-space]
+        key :start_select_line_mode, %w[Escape Control-space], %w[Control-Alt-space]
+      end
+
+      diakonos.in_mode :buffer do
+        inherits :basic, :buffers, :readline, :bookmark, :search, :select
+
+        key :backward_char,      %w[Left]
+        key :forward_char,       %w[Right]
+        key :previous_line,      %w[Up]
+        key :next_line,          %w[Down]
+        key :beginning_of_line,  %w[Home]
+        key :end_of_line,        %w[End]
+        key :page_up,            %w[Prior]
+        key :page_down,          %w[Next]
+        key :end_of_file,        %w[Alt-greater]
+        key :go_line,            %w[Alt-less]
+
+        key :forward_scroll,  %w[Alt-n]
+        key :backward_scroll, %w[Alt-p]
+
+        key [:delete_motion, :backward_char], %w[BackSpace]
+        key [:delete_motion, :forward_char],  %w[Delete]
+        key :kill_line,                       %w[Control-k], %w[Control-d Control-d]
+        key [:delete_motion, :end_of_line],   %w[Control-Alt-k], %w[Control-d dollar]
+        key [:delete_motion, :end_of_line],   %w[Control-Alt-k], %w[Control-d dollar]
+
+        key :insert_indented_newline, %w[Return]
+
+        key :indent_line,   %w[Alt-i], %w[Escape i]
+        key :unindent_line, %w[Alt-I], %w[Escape I]
+
+        key :complete_word, %w[Alt-e], %w[Escape e]
+
+        key :exec_into_new,  %w[F2]
+        key :exec_into_void, %w[F8]
+        key [:exec_into_new, 'ruby -c $f'], %w[Control-Alt-c]
+
+        key :insert_tab, %w[Control-t]
+        key :paste,      %w[Control-v]
+        key :undo,       %w[Control-z]
+        key :redo,       %w[Control-y]
+
+=begin
+        # TODO
+        key :top_of_view,        %w[Alt-comma], %w[Escape comma]
+        key :bottom_of_view,     %w[Alt-period], %w[Escape period]
+        key :previous_cursor,    %w[Control-j]
+        key :forward_cursor,     %w[Control-l]
+
+        key :ask_go_line,        %w[Control-g]
+
+
+        key :forward_join_lines, %w[Alt-j], %w[Escape j]
+        key :backward_join_lines, %w[Alt-J], %w[Escape J]
+=end
+
+        KEYSYMS.each do |sym, name|
+          key [:insert_string, sym], [name]
+        end
+
+        missing :insert_string
+      end
+
+      diakonos.in_mode :select_char do
+        inherits :buffer
+
+        key :copy_selection, %w[Control-c]
+        key :kill_selection, %w[Control-x]
+        key :delete_selection, %w[BackSpace], %w[Delete]
+        key :replace_selection_with_clipboard, %w[Control-v]
+      end
+
+      diakonos.in_mode :hover_completion do
+        inherits :basic
+
+        key :go_up,               %w[Up], %w[Control-n]
+        key :go_down,             %w[Down], %w[Control-p]
+        key :continue_completion, %w[Right], %w[Tab]
+        key :submit,              %w[Return]
+        key :cancel,              %w[Escape], %w[BackSpace]
+      end
+
+      diakonos
+    end
+  end
+end

data/config/keymap/emacs.rb

@@ -17,29 +17,29 @@ module VER
         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]
+        mode.map :quit,                            %w[Control-x Control-c]
+        mode.map :page_down,                       %w[Control-v], %w[Next]
+        mode.map :page_up,                         %w[Alt-v], %w[Prior]
+        mode.map :previous_line,                   %w[Control-p], %w[Up]
+        mode.map :next_line,                       %w[Control-n], %w[Down]
+        mode.map :backward_char,                   %w[Control-b], %w[Left]
+        mode.map :forward_char,                    %w[Control-f], %w[Right]
+        mode.map :backward_word,                   %w[Alt-b]
+        mode.map :forward_word,                    %w[Alt-f]
+        mode.map :beginning_of_line,               %w[Control-a]
+        mode.map :end_of_line,                     %w[Control-e]
+        mode.map :go_line,                         %w[Control-less]
+        mode.map :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_motion, :backward_char], %w[BackSpace]
+        mode.map [:delete_motion, :forward_char],  %w[Control-d], %w[Delete]
+        mode.map [:kill_motion, :end_of_line],     %w[Control-k]
+        mode.map :kill_sentence,                   %w[Alt-k]
+        mode.map [:kill_motion, :forward_word],    %w[Alt-d]
+        mode.map [:kill_motion, :backward_word],   %w[Alt-BackSpace]
 
         # HACK, this probably shouldn't switch modes.
         mode.map [:start_selection, :block], %w[Control-space]
@@ -63,4 +63,4 @@ module VER
       emacs
     end
   end
-end
+end

data/config/keymap/vim.rb

@@ -14,11 +14,14 @@ module VER
         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 :open_grep_list,     %w[Control-Alt-g], %w[Control-m Control-g]
+        mode.map :grep_buffer,        %w[Alt-g], %w[Control-m g]
+        mode.map :grep_buffers,       %w[Alt-G], %w[Control-m G]
+
         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]
@@ -58,7 +61,9 @@ module VER
         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 :backward_chunk,         %w[B]
         mode.map :forward_word,           %w[w], %w[Shift-Right]
+        mode.map :forward_chunk,          %w[W]
         mode.map :word_right_end,         %w[e]
         mode.map :matching_brace,         %w[percent]
       end
@@ -76,34 +81,44 @@ module VER
 
       vim.add_mode :ctags do |mode|
         mode.map :ctags_find_current, %w[Control-bracketright] # C-]
+        mode.map :ctags_prev,         %w[Control-bracketleft]  # C-[
+      end
+
+      vim.add_mode :bookmark do |mode|
+        mode.arguments = false
+
+        mode.map :char_bookmark_add,   %w[m]
+        mode.map :char_bookmark_visit, %w[quoteleft]
+        # vim also has quoteright to jump to the start of the line, but who
+        # needs that *_*
       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]
+        mode.map :complete_file,   %w[Control-x Control-f]
+        mode.map :complete_line,   %w[Control-x Control-l]
+        mode.map :complete_word,   %w[Control-x Control-w]
+        mode.map :complete_aspell, %w[Control-x Control-a]
+        mode.map :complete_tm,     %w[Control-x Control-x]
+        mode.map :smart_tab,       %w[Tab]
       end
 
       vim.add_mode :control do |mode|
-        mode.inherits :basic, :move, :views, :search, :ctags
+        mode.inherits :basic, :move, :views, :search, :ctags, :bookmark
 
         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 :kill_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 [:kill_motion, :backward_char],   %w[X]
+        mode.map [:kill_motion, :forward_char],    %w[x]
+        mode.map [:kill_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 :kill_motion,                     ['d', :move]
 
         mode.map :eol_then_insert_mode,            %w[A]
         mode.map :forward_char_then_insert_mode,   %w[a]
@@ -113,7 +128,6 @@ module VER
         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]
@@ -125,24 +139,23 @@ module VER
         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
+        mode.map :repeat_command,                  %w[period]
 
-      vim.add_mode :replace do |mode|
-        mode.inherits :basic
+        mode.map :undo,                            %w[u]
+        mode.map :redo,                            %w[Control-r]
       end
 
       vim.add_mode :readline do |mode|
         mode.arguments = false
 
-        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 [:kill_motion, :backward_char],   %w[BackSpace]
+        mode.map [:kill_motion, :forward_char],    %w[Delete], %w[Control-d]
+        mode.map [:kill_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]
@@ -177,11 +190,18 @@ module VER
         mode.missing :insert_string
       end
 
+      vim.add_mode :replace do |mode|
+        mode.inherits :insert
+        mode.arguments = false
+
+        mode.missing :replace_string
+      end
+
       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 :kill_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]
@@ -213,11 +233,11 @@ module VER
         mode.inherits :basic, :readline
         mode.arguments = false
 
-        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.map :ask_abort,  %w[Escape], %w[Control-c]
+        mode.map :history_prev, %w[Up], %w[Control-p]
+        mode.map :history_next, %w[Down], %w[Control-n]
+        mode.map :history_complete, %w[Tab]
+        mode.map :ask_submit, %w[Return]
 
         mode.missing :insert_string
       end
@@ -226,12 +246,12 @@ module VER
         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 :line_up,        %w[Up]
-        mode.to :line_down,      %w[Down]
-        mode.to :completion,     %w[Tab]
+        # mode.map :update, %w[Key]
+        mode.map :pick_selection, %w[Return]
+        mode.map :cancel,         %w[Escape], %w[Control-c]
+        mode.map :line_up,        %w[Up]
+        mode.map :line_down,      %w[Down]
+        mode.map :completion,     %w[Tab]
 
         mode.missing :insert_string
       end
@@ -239,111 +259,126 @@ module VER
       vim.add_mode :list_view_list do |mode|
         mode.inherits :basic
 
-        mode.to :pick_selection, %w[Return], %w[Double-Button-1]
-        mode.to :line_up,        %w[Up]
-        mode.to :line_down,      %w[Down]
+        mode.map :pick_selection, %w[Return], %w[Double-Button-1]
+        mode.map :line_up,        %w[Up]
+        mode.map :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]
+        mode.map :go_up,               %w[Up], %w[k]
+        mode.map :go_down,             %w[Down], %w[j]
+        mode.map :continue_completion, %w[Right], %w[l]
+        mode.map :submit,              %w[Return]
+        mode.map :cancel,              %w[Escape], %w[BackSpace]
       end
 
+      vim.ignore_sends = [
+        :repeat_command,
+        :start_control_mode,
+        :start_insert_mode,
+        :start_replace_mode,
+        :start_select_block_mode,
+        :start_select_char_mode,
+        :start_select_line_mode,
+      ]
+
+      vim.accumulate_sends = [
+        :insert_string
+      ]
+
+      vim
+    end
+  end
+end
+
+__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.map :execute,      %w[Return]
+#        mode.map :cancel,       %w[Escape], %w[Control-c]
+#        mode.map :history_up,   %w[Up]
+#        mode.map :history_down, %w[Down]
+
+         mode.map :vi_eof_maybe,           %w[Control-d]
+         mode.map :emacs_editing_mode,     %w[Control-e]
+         mode.map :abort,                  %w[Control-g]
+         mode.map :backward_char,          %w[Control-h]
+         mode.map :accept_line,            %w[Control-j], %w[Control-m]
+         mode.map :kill_line,              %w[Control-k]
+         mode.map :clear_screen,           %w[Control-l]
+         mode.map :next_history,           %w[Control-n]
+         mode.map :previous_history,       %w[Control-p], %w[minus]
+         mode.map :quoted_insert,          %w[Control-o], %w[Control-V]
+         mode.map :reverse_search_history, %w[Control-r]
+         mode.map :forward_search_history, %w[Control-s]
+         mode.map :transpose_chars,        %w[Control-t]
+         mode.map :unix_line_discard,      %w[Control-u]
+         mode.map :unix_word_rubout,       %w[Control-w]
+         mode.map :yank,                   %w[Control-y]
+         mode.map :vi_undo,                %w[Control-underscore]
+         mode.map :forwad_char,            %w[space]
+         mode.map :insert_comment,         %w[numbersign]
+         mode.map :end_of_line,            %w[dollar]
+         mode.map :vi_match,               %w[percent]
+         mode.map :vi_tilde_expand,        %w[ampersand]
+         mode.map :vi_complete,            %w[asterisk]
+         mode.map :next_history,           %w[plus]
+         mode.map :vi_char_search,         %w[comma]
+         mode.map :vi_redo,                %w[period]
+         mode.map :vi_search,              %w[numbersign]
+         mode.map :beginning_of_line,      %w[KeyPress-0]
+         mode.map :vi_char_search,         %w[semicolon]
+         mode.map :vi_complete,            %w[equal]
+         mode.map :vi_search,              %w[question]
+         mode.map :vi_append_eol,          %w[A]
+         mode.map :vi_prev_word,           %w[B]
+         mode.map :vi_change_to,           %w[C]
+         mode.map :vi_delete_to,           %w[D]
+         mode.map :vi_end_word,            %w[E]
+         mode.map :vi_char_search,         %w[F]
+         mode.map :vi_fetch_history,       %w[G]
+         mode.map :vi_insert_beg,          %w[I]
+         mode.map :vi_search_again,        %w[N]
+         mode.map :vi_put,                 %w[P]
+         mode.map :vi_replace,             %w[R]
+         mode.map :vi_subst,               %w[S]
+         mode.map :vi_char_search,         %w[T]
+         mode.map :revert_line,            %w[U]
+         mode.map :vi_next_word,           %w[W]
+         mode.map :backward_delete_char,   %w[X]
+         mode.map :vi_yank_to,             %w[Y]
+         mode.map :vi_complete,            %w[backslash]
+         mode.map :vi_first_print,         %w[asciicircum]
+         mode.map :vi_yank_arg,            %w[underscore]
+         mode.map :vi_goto_mark,           %w[quoteleft]
+         mode.map :vi_append_mode,         %w[a]
+         mode.map :vi_prev_word,           %w[b]
+         mode.map :vi_change_to,           %w[c]
+         mode.map :vi_delete_to,           %w[d]
+         mode.map :vi_end_word,            %w[e]
+         mode.map :vi_char_search,         %w[f]
+         mode.map :backward_char,          %w[h]
+         mode.map :vi_insertion_mode,      %w[i]
+         mode.map :next_history,           %w[j]
+         mode.map :prev_history,           %w[k]
+         mode.map :forward_char,           %w[l]
+         mode.map :forward_char,           %w[l]
+         mode.map :vi_set_mark,            %w[m]
+         mode.map :vi_search_again,        %w[n]
+         mode.map :vi_put,                 %w[p]
+         mode.map :vi_change_char,         %w[r]
+         mode.map :vi_subst,               %w[s]
+         mode.map :vi_char_search,         %w[t]
+         mode.map :vi_undo,                %w[u]
+         mode.map :vi_next_word,           %w[w]
+         mode.map :vi_delete,              %w[x]
+         mode.map :vi_yank_to,             %w[y]
+         mode.map :vi_column,              %w[bar]
+         mode.map :vi_change_case,         %w[asciitilde]
 
         mode.missing :insert_string
       end
-
-      vim
-    end
-  end
-end