From 0989ae36cb6aa26e30eb8762b78f1bffcb06b81b Mon Sep 17 00:00:00 2001
From: Michael Contento <michaelcontento@gmail.com>
Date: Tue, 25 Oct 2011 16:48:39 +0200
Subject: [PATCH 1/4] New theme kaffeefleck added (based on miloshadzic)

---
 themes/kaffeefleck.zsh-theme | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 themes/kaffeefleck.zsh-theme

diff --git a/themes/kaffeefleck.zsh-theme b/themes/kaffeefleck.zsh-theme
new file mode 100644
index 000000000..2c1d8a2ea
--- /dev/null
+++ b/themes/kaffeefleck.zsh-theme
@@ -0,0 +1,18 @@
+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 [ $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}'
+
+local return_code="%(?..%{$fg[red]%}%?%{$reset_color%})"
+RPROMPT='${return_code}'

From b323d92d36f8cf8a8a3bef269ccd38af5e0027f2 Mon Sep 17 00:00:00 2001
From: Michael Contento <michaelcontento@gmail.com>
Date: Tue, 25 Oct 2011 17:23:50 +0200
Subject: [PATCH 2/4] Theme kaffeefleck now compatible with miloshadzic

* Flag for the root prefix: ZSH_THEME_PREFIX_ROOT
* Flag for the RPROMPT: ZSH_THEME_USE_RPROMPT
---
 themes/kaffeefleck.zsh-theme | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/themes/kaffeefleck.zsh-theme b/themes/kaffeefleck.zsh-theme
index 2c1d8a2ea..54e12db84 100644
--- a/themes/kaffeefleck.zsh-theme
+++ b/themes/kaffeefleck.zsh-theme
@@ -6,7 +6,7 @@ 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 [ $UID -eq 0 ]; then 
+if [[ "$ZSH_THEME_PREFIX_ROOT" != "" && "$UID" -eq 0 ]]; then 
     local root_prefix="%{$fg[red]%}♚ %{$reset_color%}"
 else
     local root_prefix=""
@@ -14,5 +14,7 @@ fi
 
 PROMPT='${root_prefix}${directory}${left_delimiter}$(git_prompt_info)${right_delimiter}'
 
-local return_code="%(?..%{$fg[red]%}%?%{$reset_color%})"
-RPROMPT='${return_code}'
+if [ "$ZSH_THEME_USE_RPROMPT" != "" ]; then
+    local return_code="%(?..%{$fg[red]%}%?%{$reset_color%})"
+    RPROMPT='${return_code}'
+fi

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 3/4] 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

From 67124100873618ec93d9d57fd06b48e7b2ab065d Mon Sep 17 00:00:00 2001
From: Michael Contento <michaelcontento@gmail.com>
Date: Tue, 25 Oct 2011 17:32:42 +0200
Subject: [PATCH 4/4] Small comment added to the miloshadzic theme

---
 themes/miloshadzic.zsh-theme | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/themes/miloshadzic.zsh-theme b/themes/miloshadzic.zsh-theme
index 54e12db84..5f372b4b0 100644
--- a/themes/miloshadzic.zsh-theme
+++ b/themes/miloshadzic.zsh-theme
@@ -1,11 +1,27 @@
+# Yay! High voltage, arrows and kings!
+#
+# Some features in this theme are flagable:
+#
+# ZSH_THEME_PREFIX_ROOT=1
+#   >> Prefix the prompt with a red crown if the 
+#      current user is root
+#
+# ZSH_THEME_USE_RPROMPT=1
+#   >> Display the last return code in red in the
+#      right prompt. But only if the code was not zero.
+#
+
+# Configuration for $(git_prompt_info)
 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=""
 
+# Some variables to make things readable
 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
@@ -14,6 +30,7 @@ fi
 
 PROMPT='${root_prefix}${directory}${left_delimiter}$(git_prompt_info)${right_delimiter}'
 
+# And finally the RPROMPT if activated
 if [ "$ZSH_THEME_USE_RPROMPT" != "" ]; then
     local return_code="%(?..%{$fg[red]%}%?%{$reset_color%})"
     RPROMPT='${return_code}'