From 244c429e9026b283bcfb89c80a556c9e6e31e420 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Sun, 27 Sep 2015 20:42:46 +0200
Subject: [PATCH] 50_prompt:
 ZSH_THEME_{LOGNAME|HOSTNAME|VCS}_PROMPT_{PREFIX|SUFFIX}_SPACING

---
 core/50_prompt/50_prompt.zshrc | 18 ++++++++++++------
 themes/ax.axzshtheme           |  2 ++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/50_prompt/50_prompt.zshrc b/core/50_prompt/50_prompt.zshrc
index a5e42b1..1d32704 100644
--- a/core/50_prompt/50_prompt.zshrc
+++ b/core/50_prompt/50_prompt.zshrc
@@ -3,10 +3,12 @@
 
 # Logname ("user name")
 
+ZSH_THEME_LOGNAME_PROMPT_PREFIX_SPACING=""
 (( $UID == 0 )) \
 	&& ZSH_THEME_LOGNAME_PROMPT_PREFIX="%{$fg_no_bold[red]%}" \
 	|| ZSH_THEME_LOGNAME_PROMPT_PREFIX=""
-ZSH_THEME_LOGNAME_PROMPT_SUFFIX="%{$reset_color%}@"
+ZSH_THEME_LOGNAME_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_LOGNAME_PROMPT_SUFFIX_SPACING="@"
 
 function ax_logname_prompt_root() {
 	(( $UID == 0 )) || return 1
@@ -17,7 +19,7 @@ function ax_logname_prompt_yn() {
 	local func
 	for func ($ax_logname_prompt_functions); do
 		$func || continue
-		echo "${ZSH_THEME_LOGNAME_PROMPT_PREFIX}${1:-$LOGNAME}${ZSH_THEME_LOGNAME_PROMPT_SUFFIX}"
+		echo "${ZSH_THEME_LOGNAME_PROMPT_PREFIX_SPACING}${ZSH_THEME_LOGNAME_PROMPT_PREFIX}${1:-$LOGNAME}${ZSH_THEME_LOGNAME_PROMPT_SUFFIX}${ZSH_THEME_LOGNAME_PROMPT_SUFFIX_SPACING}"
 		return
 	done
 }
@@ -26,8 +28,10 @@ ax_logname_prompt_functions=()
 
 # Hostname
 
+ZSH_THEME_HOSTNAME_PROMPT_PREFIX_SPACING=""
 ZSH_THEME_HOSTNAME_PROMPT_PREFIX=""
 ZSH_THEME_HOSTNAME_PROMPT_SUFFIX="%{$reset_color%}:"
+ZSH_THEME_HOSTNAME_PROMPT_SUFFIX_SPACING=""
 
 function ax_hostname_prompt_root() {
 	(( $UID == 0 )) || return 1
@@ -38,7 +42,7 @@ function ax_hostname_prompt_yn() {
 	local func
 	for func ($ax_hostname_prompt_functions); do
 		$func || continue
-		echo "${ZSH_THEME_HOSTNAME_PROMPT_PREFIX}${1:-$SHORT_HOST}${ZSH_THEME_HOSTNAME_PROMPT_SUFFIX}"
+		echo "${ZSH_THEME_HOSTNAME_PROMPT_PREFIX_SPACING}${ZSH_THEME_HOSTNAME_PROMPT_PREFIX}${1:-$SHORT_HOST}${ZSH_THEME_HOSTNAME_PROMPT_SUFFIX}${ZSH_THEME_HOSTNAME_PROMPT_SUFFIX_SPACING}"
 		return
 	done
 }
@@ -47,8 +51,10 @@ ax_hostname_prompt_functions=()
 
 # VCS
 
-ZSH_THEME_VCS_PROMPT_PREFIX="(%{$fg_no_bold[yellow]%}"
-ZSH_THEME_VCS_PROMPT_SUFFIX="%{$reset_color%}) "
+ZSH_THEME_VCS_PROMPT_PREFIX_SPACING="("
+ZSH_THEME_VCS_PROMPT_PREFIX="%{$fg_no_bold[yellow]%}"
+ZSH_THEME_VCS_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_VCS_PROMPT_SUFFIX_SPACING=")"
 
 ZSH_THEME_VCS_PROMPT_CLEAN="%{$fg_no_bold[green]%}✔"
 ZSH_THEME_VCS_PROMPT_DIRTY="%{$fg_no_bold[red]%}✘"
@@ -60,7 +66,7 @@ function ax_vcs_prompt() {
 	local p
 	for func ($ax_vcs_prompt_functions); do
 		p=$( $func ) || continue
-		echo "${ZSH_THEME_VCS_PROMPT_PREFIX}${p}${ZSH_THEME_VCS_PROMPT_SUFFIX}"
+		echo "${ZSH_THEME_VCS_PROMPT_PREFIX_SPACING}${ZSH_THEME_VCS_PROMPT_PREFIX}${p}${ZSH_THEME_VCS_PROMPT_SUFFIX}${ZSH_THEME_VCS_PROMPT_SUFFIX_SPACING}"
 		return
 	done
 }
diff --git a/themes/ax.axzshtheme b/themes/ax.axzshtheme
index d0363b4..53d46ba 100644
--- a/themes/ax.axzshtheme
+++ b/themes/ax.axzshtheme
@@ -1,6 +1,8 @@
 # AX-ZSH: Alex' Modular ZSH Configuration
 # ax.axzshtheme: Default AX-ZSH Theme
 
+ZSH_THEME_VCS_PROMPT_SUFFIX_SPACING=") "
+
 ax_logname_prompt_functions=($ax_logname_prompt_functions ax_logname_prompt_root)
 ax_hostname_prompt_functions=($ax_hostname_prompt_functions ax_hostname_prompt_root)
 
-- 
2.39.2