From 2b2cc53f2b02b4f962d45669aa0ba4c474777726 Mon Sep 17 00:00:00 2001
From: David Majnemer <dmajnem2@uiuc.edu>
Date: Mon, 31 May 2010 15:48:54 -0700
Subject: [PATCH] sync up with Saleem

---
 zsh/00_options | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/zsh/00_options b/zsh/00_options
index 2973d5a..ea693b8 100755
--- a/zsh/00_options
+++ b/zsh/00_options
@@ -10,26 +10,30 @@ fi
 trap clear 0
 
 # shell options
-setopt AUTO_CD             # directoy command does cd
-setopt CORRECT             # correct spelling of commands
-setopt AUTO_PUSHD          # cd uses directory stack
-setopt CHASE_DOTS          # resolve .. in cd
-setopt CHASE_LINKS         # resolve symbolic links in cd
-setopt CDABLE_VARS         # cd var works if $var is a directory
-setopt PUSHD_SILENT        # make pushd quiet
-setopt ALWAYS_TO_END       # goto end of word on completion
-setopt EXTENDED_GLOB       # use zsh globbing extensions
-setopt SH_WORD_SPLIT       # split non-array variables
-setopt BASH_AUTO_LIST      # list completions on second tab
-setopt LIST_ROWS_FIRST     # list completions across
-setopt COMPLETE_IN_WORD    # completion works inside words
-setopt MAGIC_EQUAL_SUBST   # special expansion after all =
-
-unsetopt BEEP              # stop beeping!
-unsetopt LIST_BEEP         # seriously, stop beeping!
+setopt ALWAYS_TO_END          # goto end of word on completion
+setopt AUTO_CD                # directoy command does cd
+setopt AUTO_PUSHD             # cd uses directory stack
+setopt BASH_AUTO_LIST         # list completions on second tab
+setopt CDABLE_VARS            # cd var works if $var is a directory
+setopt CHASE_DOTS             # resolve .. in cd
+setopt CHASE_LINKS            # resolve symbolic links in cd
+setopt COMPLETE_IN_WORD       # completion works inside words
+setopt CORRECT                # correct spelling of commands
+setopt EXTENDED_GLOB          # use zsh globbing extensions
+setopt INTERACTIVE_COMMENTS   # allow comments in interactive shells
+setopt LIST_ROWS_FIRST        # list completions across
+setopt MAGIC_EQUAL_SUBST      # special expansion after all =
+setopt PUSHD_SILENT           # make pushd quiet
+setopt PROMPT_SUBST           # allow substitutions in the prompt
+setopt SH_WORD_SPLIT          # split non-array variables
 
 unsetopt NO_MATCH          # dont error on no glob matches
 
+# (disable) beeping
+unsetopt BEEP              # stop beeping!
+unsetopt HIST_BEEP         # really, stop beeping!
+unsetopt LIST_BEEP         # seriously, stop beeping!
+
 # history
 export HISTSIZE=1000
 export SAVEHIST=1000