From 42bb372e64f403b0809a5f701641f64053a7c46e Mon Sep 17 00:00:00 2001
From: Michael Contento <michaelcontento@gmail.com>
Date: Tue, 25 Oct 2011 17:25:34 +0200
Subject: [PATCH] Theme kaffeefleck renamed into miloshadzic

With the last commit (b323d92) the kaffeefleck theme is compatible
with the miloshadzic theme and both new features are flagable.
---
 themes/kaffeefleck.zsh-theme | 20 --------------------
 themes/miloshadzic.zsh-theme | 20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 24 deletions(-)
 delete mode 100644 themes/kaffeefleck.zsh-theme

diff --git a/themes/kaffeefleck.zsh-theme b/themes/kaffeefleck.zsh-theme
deleted file mode 100644
index 54e12db84..000000000
--- a/themes/kaffeefleck.zsh-theme
+++ /dev/null
@@ -1,20 +0,0 @@
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
-
-local directory="%{$fg[cyan]%}%1~%{$reset_color%}"
-local left_delimiter="%{$fg[red]%}|%{$reset_color%}"
-local right_delimiter=" %{$fg[cyan]%}⇒%{$reset_color%} "
-if [[ "$ZSH_THEME_PREFIX_ROOT" != "" && "$UID" -eq 0 ]]; then 
-    local root_prefix="%{$fg[red]%}♚ %{$reset_color%}"
-else
-    local root_prefix=""
-fi
-
-PROMPT='${root_prefix}${directory}${left_delimiter}$(git_prompt_info)${right_delimiter}'
-
-if [ "$ZSH_THEME_USE_RPROMPT" != "" ]; then
-    local return_code="%(?..%{$fg[red]%}%?%{$reset_color%})"
-    RPROMPT='${return_code}'
-fi
diff --git a/themes/miloshadzic.zsh-theme b/themes/miloshadzic.zsh-theme
index ad5394423..54e12db84 100644
--- a/themes/miloshadzic.zsh-theme
+++ b/themes/miloshadzic.zsh-theme
@@ -1,8 +1,20 @@
-# Yay! High voltage and arrows!
-
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-PROMPT='%{$fg[cyan]%}%1~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}$(git_prompt_info)%{$fg[cyan]%}⇒%{$reset_color%} '
+local directory="%{$fg[cyan]%}%1~%{$reset_color%}"
+local left_delimiter="%{$fg[red]%}|%{$reset_color%}"
+local right_delimiter=" %{$fg[cyan]%}⇒%{$reset_color%} "
+if [[ "$ZSH_THEME_PREFIX_ROOT" != "" && "$UID" -eq 0 ]]; then 
+    local root_prefix="%{$fg[red]%}♚ %{$reset_color%}"
+else
+    local root_prefix=""
+fi
+
+PROMPT='${root_prefix}${directory}${left_delimiter}$(git_prompt_info)${right_delimiter}'
+
+if [ "$ZSH_THEME_USE_RPROMPT" != "" ]; then
+    local return_code="%(?..%{$fg[red]%}%?%{$reset_color%})"
+    RPROMPT='${return_code}'
+fi