diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index c168aa43..c47cb371 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -119,7 +119,9 @@ set mat=2
 set noerrorbells
 set novisualbell
 set t_vb=
-set tm=500
+" Unset this timeout
+set tm=200
+set ttimeoutlen=0
 
 " Properly disable sound on errors on MacVim
 if has("gui_macvim")
diff --git a/vimrcs/google.vim b/vimrcs/google.vim
index a078e10b..7f30804f 100644
--- a/vimrcs/google.vim
+++ b/vimrcs/google.vim
@@ -19,7 +19,7 @@ Glug blazedeps
 
 " code format for build file
 Glug codefmt
-Glug codefmt-google
+Glug codefmt-google auto_filetypes+=python,cc,proto,
 autocmd FileType bzl AutoFormatBuffer buildifier
 
 Glug relatedfiles plugin[mappings]=',2'
@@ -135,3 +135,12 @@ command! -nargs=+ CommandCabbr call CommandCabbr(<f-args>)
 execute 'CommandCabbr ccab CommandCabbr'
 execute 'CommandCabbr e GoogleE'
 
+" Play the macro in register q.
+nnoremap <Leader>. @q
+
+" FromProto
+let @f = "ywidata.\<Esc>wwi = proto.\<Esc>pa()\<Esc>jb"
+" ToProto
+let @t = "ywiif (proto->\<Esc>wwi() != data.\<Esc>pa) {\<Enter>\<Enter>}\<Esc>kAproto->\<Esc>pbdwaset_\<Esc>pa(data.\<Esc>pa);\<Esc>jxj"
+
+