Merge branch 'add_toggles' of ajohnson/zsh into master

.gitignore

@@ -1,2 +1,3 @@
 /zsh.conf
+/custom
 

example_configs/zsh.conf

@@ -1,9 +1,11 @@
 # ZSH Configuration
 BSD_MODE=false			#Some options must be specified differently in BSD
 SYNTAX_HIGHLIGHT=true		#On-the-fly syntax highlighting of commands that you type
+AUTO_CD=true			#When true, if only a directory path is entered, you will cd to the directory
 
 # Prompt Style
 PROMPT_STYLE=bsd		#Valid options: bsd, bsd2, ar5
+COMPLETION_STYLE=bash		#ZSH "automenu" option toggle - Valid options: bash, zsh (defaults to bash)
 
 # Example prompts:
 # bsd: user@host:~/storage/git[git-branch]%

setopt

@@ -2,10 +2,14 @@ autoload -U compinit promptinit
 autoload -U colors && colors
 compinit -d ${HOME}/.cache/.zcompdump
 promptinit
-setopt autocd
+if [ $AUTO_CD = true ]
+then
+  setopt autocd
+fi
 unsetopt beep
 setopt HIST_IGNORE_SPACE
-
-## BASH-style completion; comment out for full ZSH completion.
-setopt noautomenu
+if [ $COMPLETION_STYLE = bash ]
+then
+  setopt noautomenu
+fi
 

zshrc

@@ -7,7 +7,6 @@ else
   source $HOME/.zsh/interactive
   source $HOME/.zsh/exports
   source $HOME/.zsh/bindkeys
-  source $HOME/.zsh/completion
   source $HOME/.zsh/setopt
   PROMPT="UNCONFIGURED%# "
   return 1
@@ -17,7 +16,6 @@ source $HOME/.zsh/alias
 source $HOME/.zsh/interactive
 source $HOME/.zsh/exports
 source $HOME/.zsh/bindkeys
-source $HOME/.zsh/completion
 source $HOME/.zsh/setopt
 if [ $SYNTAX_HIGHLIGHT = true ]
 then