From a5fa978579a2d9a08d89463e55b77ab3513ccfca Mon Sep 17 00:00:00 2001
From: Kartik Agaram <vc@akkartik.com>
Date: Sun, 15 Sep 2019 16:30:46 -0700
Subject: 5662

Fix several breakages.
---
 run_one_test | 2 +-
 vimrc.vim    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/run_one_test b/run_one_test
index 9452524e..b8eeaad5 100755
--- a/run_one_test
+++ b/run_one_test
@@ -19,5 +19,5 @@ fi
 
 set -e
 
-./debug_translate $(echo $FILES) /tmp/run_one_test.subx
+./debug_translate init.linux $(echo $FILES) /tmp/run_one_test.subx
 ONLY_CPP=1 CFLAGS=$CFLAGS ./subx --debug --trace run a.elf
diff --git a/vimrc.vim b/vimrc.vim
index ed3e1843..22d3f99a 100644
--- a/vimrc.vim
+++ b/vimrc.vim
@@ -83,7 +83,7 @@ if empty($TMUX)
   "   can't put initial cursor movement inside function because we rely on <C-r><C-w> to grab word at cursor
   "   can't put final cursor movement out of function because that disables the wait for <CR> prompt; function must be final operation of map
   "   can't avoid the function because that disables the wait for <CR> prompt
-  noremap <Leader>t {j0:keeppatterns /[^ #]<CR>:call RunTestMoveCursor("<C-r><C-w>")<CR>
+  noremap <Leader>t {:keeppatterns /^[^ #]<CR>:call RunTestMoveCursor("<C-r><C-w>")<CR>
   function RunTestMoveCursor(arg)
     exec "!./run_one_test ".expand("%")." ".a:arg
     exec "normal \<C-o>"
@@ -91,7 +91,7 @@ if empty($TMUX)
 else
   " we have tmux; we don't need to show any output in the Vim pane so life is simpler
   " assume the left-most window is for the shell
-  noremap <Leader>t {j0:keeppatterns /[^ #]<CR>:silent! call RunTestInFirstPane("<C-r><C-w>")<CR><C-o>
+  noremap <Leader>t {:keeppatterns /^[^ #]<CR>:silent! call RunTestInFirstPane("<C-r><C-w>")<CR><C-o>
   function RunTestInFirstPane(arg)
     call RunInFirstPane("./run_one_test ".expand("%")." ".a:arg)
   endfunction
-- 
cgit 1.4.1-2-gfad0