@@ -1907,7 +1907,6 @@ fn goto_mode(cx: &mut Context) {
1907 match (doc.mode, ch) {
1907 match (doc.mode, ch) {
1908 (_, 'g') => move_file_start(cx),
1908 (_, 'g') => move_file_start(cx),
1909 (_, 'e') => move_file_end(cx),
1909 (_, 'e') => move_file_end(cx),
1910− (_, 'm') => match_brackets(cx),
1911 (_, 'a') => switch_to_last_accessed_file(cx),
1910 (_, 'a') => switch_to_last_accessed_file(cx),
1912 (Mode::Normal, 'h') => move_line_start(cx),
1911 (Mode::Normal, 'h') => move_line_start(cx),
1913 (Mode::Normal, 'l') => move_line_end(cx),
1912 (Mode::Normal, 'l') => move_line_end(cx),
@@ -3324,6 +3323,7 @@ fn surround(cx: &mut Context) {
3324 // FIXME: count gets reset because of cx.on_next_key()
3323 // FIXME: count gets reset because of cx.on_next_key()
3325 cx.count = count;
3324 cx.count = count;
3326 match ch {
3325 match ch {
3326+ 'm' => match_brackets(cx),
3327 'a' => surround_add(cx),
3327 'a' => surround_add(cx),
3328 'r' => surround_replace(cx),
3328 'r' => surround_replace(cx),
3329 'd' => {
3329 'd' => {