From 1338b0ece41c18b35c2672a93509a35fb33ea523 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@live.ca>
Date: Fri, 9 Feb 2018 22:36:16 -0500
Subject: [PATCH] Fixed gpla and Vim mappings

- gpla: Pop stashed changes before clearing them.
- Vim mappings: Remove spacing at end because Vim already adds a space
  after mappings.
---
 .vimrc                | 36 ++++++++++++++++++------------------
 aliases/.bash_aliases |  2 +-
 aliases/.git_aliases  |  2 +-
 aliases/.pc_aliases   |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.vimrc b/.vimrc
index 692b59f..837f2f7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -87,23 +87,23 @@ nnoremap <leader>s :set syn=sh<CR>
 
 " Local Mappings {{{ "
 let maplocalleader="-"
-autocmd Filetype c inoremap <localleader>s struct pixel 
+autocmd Filetype c inoremap <localleader>s struct pixel
 
-autocmd Filetype tex inoremap <localleader>e \exists  
-autocmd Filetype tex inoremap <localleader>fa \forall  
-autocmd Filetype tex inoremap <localleader>g \geq  
-autocmd Filetype tex inoremap <localleader>i \in 
-autocmd Filetype tex inoremap <localleader>l \leq  
-autocmd Filetype tex inoremap <localleader>lr \Leftrightarrow   
-autocmd Filetype tex inoremap <localleader>n \neg 
-autocmd Filetype tex inoremap <localleader>N \mathbb{N} 
-autocmd Filetype tex inoremap <localleader>R \Rightarrow 
-autocmd Filetype tex inoremap <localleader>st such that 
-autocmd Filetype tex inoremap <localleader>t \times 
-autocmd Filetype tex inoremap <localleader>T $T$ 
-autocmd Filetype tex inoremap <localleader>v \vee 
-autocmd Filetype tex inoremap <localleader>w \wedge 
-autocmd Filetype tex inoremap <localleader>x $x$-axis 
-autocmd Filetype tex inoremap <localleader>y $y$-axis 
-autocmd Filetype tex inoremap <localleader>Z \mathbb{Z} 
+autocmd Filetype tex inoremap <localleader>e \exists
+autocmd Filetype tex inoremap <localleader>fa \forall
+autocmd Filetype tex inoremap <localleader>g \geq
+autocmd Filetype tex inoremap <localleader>i \in
+autocmd Filetype tex inoremap <localleader>l \leq
+autocmd Filetype tex inoremap <localleader>lr \Leftrightarrow
+autocmd Filetype tex inoremap <localleader>n \neg
+autocmd Filetype tex inoremap <localleader>N \mathbb{N}
+autocmd Filetype tex inoremap <localleader>R \Rightarrow
+autocmd Filetype tex inoremap <localleader>st such that
+autocmd Filetype tex inoremap <localleader>t \times
+autocmd Filetype tex inoremap <localleader>T $T$
+autocmd Filetype tex inoremap <localleader>v \vee
+autocmd Filetype tex inoremap <localleader>w \wedge
+autocmd Filetype tex inoremap <localleader>x $x$-axis
+autocmd Filetype tex inoremap <localleader>y $y$-axis
+autocmd Filetype tex inoremap <localleader>Z \mathbb{Z}
 " }}} Local Mappings "
diff --git a/aliases/.bash_aliases b/aliases/.bash_aliases
index 9185567..28fd03a 100644
--- a/aliases/.bash_aliases
+++ b/aliases/.bash_aliases
@@ -49,5 +49,5 @@ alias rx="redshift -x"
 usnp_dir="~/.vim/plugged/vim-snippets/UltiSnips"
 alias snp="d $usnp_dir"
 vsnp() { vi ~/.vim/plugged/vim-snippets/UltiSnips/"$1".snippets ; }
-alias tmsp="vi $usnp_dir/texmath.snippets"
+alias tm="vi $usnp_dir/texmath.snippets"
 # }}} #
diff --git a/aliases/.git_aliases b/aliases/.git_aliases
index b1b5fc4..5fdb057 100644
--- a/aliases/.git_aliases
+++ b/aliases/.git_aliases
@@ -39,7 +39,7 @@ gunc() { git update-index --assume-unchanged $1 ; }
 gpla() { 
 	cmds="lc snp 9r sch"
 	for cmd in $cmds; do
-		eval $cmd && gst && gpl && gclear
+		eval $cmd && gst && gpl && gstp && gclear
 	done
 }
 # Functions }}}
diff --git a/aliases/.pc_aliases b/aliases/.pc_aliases
index a90035c..fc0bf3e 100644
--- a/aliases/.pc_aliases
+++ b/aliases/.pc_aliases
@@ -4,7 +4,7 @@ if [ "$(whoami)" == "kevin" ]; then
 
 	alias mt="ok ~/Documents/School/calc-textbook.pdf"
 	alias clc="gcalccmd"
-	alias 36t="ok ~/Documents/School/236-textbook.pdf"
+	alias 6t="ok ~/Documents/School/236-textbook.pdf"
 fi
 # Both PC/Laptop }}}