.vim: Fix name `SearchConflictMarkers`

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index 892921c6beb5cbcc383929c5a5f0ddbf41456f7f..944d2f631326f04f58168a1cefa5fbd13f56ae4c 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -165,8 +165,16 @@ if which tmux >/dev/null 2>&1; then
 fi
 
 
+vim() {
+    command vim "$@"
+    rc=$?
+    cd "`cat \"$HOME/tmp/vim/cwd\"`" && /bin/rm "$HOME/tmp/vim/cwd" &&
+    return $rc
+}
+
+
 if [ "$SHLVL" -eq 1 ] && which startx >/dev/null 2>&1; then
-    X() { startx >> .Xserver.log 2>&1; cyr; rm -f .Xauthority; }
+    X() { startx >> .Xserver.log 2>&1; cyr; /bin/rm -f .Xauthority; }
 fi
 
 x() { exit; }