remove unneded compdef calls, add zshenv.local.sample entry for safemvcp

diff --git a/.zsh/35_Aliases.zsh b/.zsh/35_Aliases.zsh
index e5aff4d..2c949d8 100644 (file)
--- a/.zsh/35_Aliases.zsh
+++ b/.zsh/35_Aliases.zsh
@@ -61,7 +61,6 @@ is-command mc && alias mc='mc -d -U'
 alias cpan='perl -MCPAN -e shell'
 alias rh='run-help'
 
-
 if [ -x /usr/bin/recode ]; then
     alias unix2dos='recode lat1..ibmpc'
     alias dos2unix='recode ibmpc..lat1'

diff --git a/.zsh/45_Completion.zsh b/.zsh/45_Completion.zsh
index 5bd073b..b238b85 100644 (file)
--- a/.zsh/45_Completion.zsh
+++ b/.zsh/45_Completion.zsh
@@ -175,36 +175,3 @@ compdef _hosts ssha
 
 _debian_rules() { words=(make -f debian/rules) _make }
 compdef _debian_rules debian/rules
-
-if is434; then
-    # git related
-    compdef g=git
-    compdef _git gst=git-status
-    compdef _git gl=git-pull
-    compdef _git gup=git-fetch
-    compdef _git gp=git-push
-    gdv() { git diff -w "$@" }
-    compdef _git gdv=git-diff
-    compdef _git gc=git-commit
-    compdef _git gca=git-commit
-    compdef _git gco=git-checkout
-    compdef _git gr=git-remote
-    compdef _git grv=git-remote
-    compdef _git grmv=git-remote
-    compdef _git grrm=git-remote
-    compdef _git grset=git-remote
-    compdef _git grset=git-remote
-    compdef _git gb=git-branch
-    compdef _git gba=git-branch
-    compdef gcount=git
-    compdef _git gcp=git-cherry-pick
-    compdef _git glg=git-log
-    compdef _git glgg=git-log
-    compdef _git glgga=git-log
-    compdef _git gss=git-status
-    compdef _git ga=git-add
-    compdef _git gm=git-merge
-    compdef ggpull=git
-    compdef ggpush=git
-    compdef ggpnp=git
-fi

diff --git a/.zsh/zshenv.local.sample b/.zsh/zshenv.local.sample
index 753de25..aed06f6 100644 (file)
--- a/.zsh/zshenv.local.sample
+++ b/.zsh/zshenv.local.sample
@@ -196,6 +196,10 @@ lmanpath=(
 ## subdirectories, Keybindings.zsh) to set the keybindings.
 # zstyle ':ganneff:config' pluginbindkeys false
 
+## Want to have -i option for mv/cp, ie. interactive, prompt before
+## overwriting?
+# zstyle ':ganneff:config' safemvcp false
+
 ########################################################################
 ### Prompt setup                                                     ###
 ## use vcs_info in prompt