@@ -20,7 +20,7 @@ parse_git_dirty() {

 # Checks if there are commits ahead from remote

 function git_prompt_ahead() {

-  if $(echo "$(git log origin/master..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then

+  if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then

     echo "$ZSH_THEME_GIT_PROMPT_AHEAD"

   fi

 }

@@ -20,6 +20,11 @@ bindkey ' ' magic-space    # also do history expansion on space

 bindkey '^[[Z' reverse-menu-complete

+# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~

+bindkey "^[[3~" delete-char

+bindkey "^[3;5~" delete-char

+bindkey "\e[3~" delete-char

+

 # consider emacs keybindings:

 #bindkey -e  ## emacs key bindings

new file mode 100644

@@ -0,0 +1,6 @@

+# commands to control local apache2 server installation

+# paths are for osx installation via macports

+

+alias apache2start='sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper start'

+alias apache2stop='sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper stop'

+alias apache2restart='sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper restart'

new file mode 100644

@@ -0,0 +1,22 @@

+# ------------------------------------------------------------------------------

+#          FILE:  compleat.plugin.zsh

+#   DESCRIPTION:  oh-my-zsh plugin file.

+#        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)

+#       VERSION:  1.0.0

+# ------------------------------------------------------------------------------

+

+

+if (( ${+commands[compleat]} )); then

+  local prefix="${commands[compleat]:h:h}"

+  local setup="${prefix}/share/compleat-1.0/compleat_setup" 

+

+  if [[ -f "$setup" ]]; then

+    if ! bashcompinit >/dev/null 2>&1; then

+      autoload -U bashcompinit

+      bashcompinit -i

+    fi

+

+    source "$setup" 

+  fi

+fi

+

new file mode 100644

@@ -0,0 +1,4 @@

+PROMPT=$'%{$fg[green]%}%n@%m: %{$reset_color%}%{$fg[blue]%}%/%{$reset_color%}

+%{$fg_bold[red]%}➜ %{$reset_color%} '

+

+PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}"

@@ -1,6 +1,6 @@

 #PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'

 PROMPT="%{$fg_bold[cyan]%}%T%{$fg_bold[green]%} %{$fg_bold[white]%}%n%{$fg[magenta]%}@%{$fg_bold[white]%}%m %{$fg_bold[green]%}%d

-%{$fg_bold[yellow]%}%% $(git_prompt_info)%{$reset_color%}"

+%{$fg_bold[yellow]%}%% %{$reset_color%}"

 #ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"

 #ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"