diff --git a/.vim/autoload/vimrc/lazyload.vim b/.vim/autoload/vimrc/lazyload.vim
index 1103740..a0210ec 100644
--- a/.vim/autoload/vimrc/lazyload.vim
+++ b/.vim/autoload/vimrc/lazyload.vim
@@ -182,10 +182,7 @@ au vimrc SafeState * ++once B()
 enddef
 au vimrc BufReadPost * C()
 C()
-nm <SID>(buf)n <Cmd>bnext<CR><Cmd>call vimrc#bufline#Show()<CR><SID>(buf)
-nm <SID>(buf)p <Cmd>bprevious<CR><Cmd>call vimrc#bufline#Show()<CR><SID>(buf)
-nm gn <SID>(buf)n
-nm gp <SID>(buf)p
+Each n,p nmap g{} <SID>(buf)n|nm <SID>(buf){} <Cmd>b{}<CR><Cmd>call vimrc#bufline#Show()<CR><SID>(buf)
 g:recentBufnr = 0
 au vimrc BufLeave * g:recentBufnr = bufnr()
 nn <expr> gr $"\<Cmd>b{g:recentBufnr}\<CR>"
diff --git a/src/.vim/autoload/vimrc/lazyload.src.vim b/src/.vim/autoload/vimrc/lazyload.src.vim
index 1c57359..cce2ce0 100644
--- a/src/.vim/autoload/vimrc/lazyload.src.vim
+++ b/src/.vim/autoload/vimrc/lazyload.src.vim
@@ -292,10 +292,7 @@ SetupTabstopLazy()
 # ------------------------------------------------------
 # バッファ操作 {{{
 # gnとgpで移動
-nmap <SID>(buf)n <Cmd>bnext<CR><Cmd>call vimrc#bufline#Show()<CR><SID>(buf)
-nmap <SID>(buf)p <Cmd>bprevious<CR><Cmd>call vimrc#bufline#Show()<CR><SID>(buf)
-nmap gn <SID>(buf)n
-nmap gp <SID>(buf)p
+Each n,p nmap g{} <SID>(buf)n|nmap <SID>(buf){} <Cmd>b{}<CR><Cmd>call vimrc#bufline#Show()<CR><SID>(buf)
 # grで直前のバッファ
 g:recentBufnr = 0
 au vimrc BufLeave * g:recentBufnr = bufnr()
diff --git a/test/vimrc.test.vim b/test/vimrc.test.vim
index 65eab80..3fdeb4d 100644
--- a/test/vimrc.test.vim
+++ b/test/vimrc.test.vim
@@ -108,6 +108,8 @@ suite.TestMapping = () => {
 	# n  gn バッファ移動
 	# n  gp バッファ移動
 	# n  gr バッファ移動
+	# n  gt タブ移動
+	# n  gT タブ移動
 	# n  g; 折り畳みを開くように修正
 	# n  i  _cc
 	# n  m  '
@@ -138,7 +140,7 @@ suite.TestMapping = () => {
 	# i  <C-G> 色付きで表示
 	var default_ignore = '\C' .. [
 		'n  \([abBehijklmnopqswAMOPQSTY;''/?:%,+]\)',
-		'n  \(g[acdesinpr;]\)',
+		'n  \(g[acdesinprtT;]\)',
 		'n  \(zd\|zf\|ZZ\)',
 		'n  \(G[ai%]\)',
 		'n  \(<C-[AWXG]>\)',