keymap.rb in textbringer-0.1.8

- old
+ new

@@ -94,29 +94,31 @@
   GLOBAL_MAP.define_key(?\C-y, :yank)
   GLOBAL_MAP.define_key("\ey", :yank_pop)
   GLOBAL_MAP.define_key(?\C-_, :undo)
   GLOBAL_MAP.define_key("\C-x\C-_", :redo)
   GLOBAL_MAP.define_key("\C-t", :transpose_chars)
-  GLOBAL_MAP.define_key(?\n, :newline)
+  GLOBAL_MAP.define_key("\C-j", :newline)
+  GLOBAL_MAP.define_key("\C-m", :newline)
   GLOBAL_MAP.define_key("\C-l", :recenter)
   GLOBAL_MAP.define_key("\C-v", :scroll_up)
   GLOBAL_MAP.define_key(:npage, :scroll_up)
   GLOBAL_MAP.define_key("\ev", :scroll_down)
   GLOBAL_MAP.define_key(:ppage, :scroll_down)
   GLOBAL_MAP.define_key("\C-x0", :delete_window)
   GLOBAL_MAP.define_key("\C-x1", :delete_other_windows)
   GLOBAL_MAP.define_key("\C-x2", :split_window)
   GLOBAL_MAP.define_key("\C-xo", :other_window)
+  GLOBAL_MAP.define_key("\C-x^", :enlarge_window)
   GLOBAL_MAP.define_key("\C-x\C-c", :exit_textbringer)
   GLOBAL_MAP.define_key("\C-z", :suspend_textbringer)
   GLOBAL_MAP.define_key("\C-x\C-f", :find_file)
   GLOBAL_MAP.define_key("\C-xb", :switch_to_buffer)
   GLOBAL_MAP.define_key("\C-x\C-s", :save_buffer)
   GLOBAL_MAP.define_key("\C-x\C-w", :write_file)
   GLOBAL_MAP.define_key("\C-xk", :kill_buffer)
-  GLOBAL_MAP.define_key("\C-x\nf", :set_buffer_file_encoding)
-  GLOBAL_MAP.define_key("\C-x\nn", :set_buffer_file_format)
+  GLOBAL_MAP.define_key("\C-x\C-mf", :set_buffer_file_encoding)
+  GLOBAL_MAP.define_key("\C-x\C-mn", :set_buffer_file_format)
   GLOBAL_MAP.define_key("\ex", :execute_command)
   GLOBAL_MAP.define_key("\e:", :eval_expression)
   GLOBAL_MAP.define_key(?\C-u, :universal_argument)
   GLOBAL_MAP.define_key(?\C-g, :keyboard_quit)
   GLOBAL_MAP.define_key(?\C-s, :isearch_forward)
@@ -130,9 +132,10 @@
       nil
     end
   end
 
   MINIBUFFER_LOCAL_MAP = Keymap.new
-  MINIBUFFER_LOCAL_MAP.define_key(?\n, :exit_recursive_edit)
+  MINIBUFFER_LOCAL_MAP.define_key("\C-j", :exit_recursive_edit)
+  MINIBUFFER_LOCAL_MAP.define_key("\C-m", :exit_recursive_edit)
   MINIBUFFER_LOCAL_MAP.define_key(?\t, :complete_minibuffer)
   MINIBUFFER_LOCAL_MAP.define_key(?\C-g, :abort_recursive_edit)
 end