From a8c42bc70676576c92a13df2546c6c5c9868c5d5 Mon Sep 17 00:00:00 2001
From: Ian Adam Naval <ianonavy@gmail.com>
Date: Mon, 6 Apr 2015 03:14:07 -0400
Subject: [PATCH] Remove RPROMPT

Causes weird problems over SSH.
---
 modules/prompt/functions/prompt_ianonavy_setup | 4 ++--
 runcoms/zlogin                                 | 2 +-
 runcoms/zlogout                                | 7 -------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/modules/prompt/functions/prompt_ianonavy_setup b/modules/prompt/functions/prompt_ianonavy_setup
index 0ee2197..24db0c5 100644
--- a/modules/prompt/functions/prompt_ianonavy_setup
+++ b/modules/prompt/functions/prompt_ianonavy_setup
@@ -99,9 +99,9 @@ function prompt_ianonavy_setup {
 
   # Define prompts.
   PROMPT="
-${user}${host} ${current_path} $time${_prompt_ianonavy_colors[1]}"'${python_info[virtualenv]}'""'${git_info[prompt]}'"
+${user}${host} ${current_path} $time${_prompt_ianonavy_colors[1]}"'${python_info[virtualenv]}'""'${git_info[prompt]}'""%(?..${_prompt_ianonavy_colors[3]}%? ↵%f)"
 ${promptcolor}"'${editor_info[keymap]}'"${_prompt_ianonavy_nocolor} "
-  RPROMPT='%(?..${_prompt_ianonavy_colors[3]}%? ↵%f)'
+  RPROMPT=''
   SPROMPT='zsh: correct ${_prompt_ianonavy_colors[3]}%R${_prompt_ianonavy_nocolor} to ${_prompt_ianonavy_colors[2]}%r${_prompt_ianonavy_nocolor} [nyae]? '
 }
 
diff --git a/runcoms/zlogin b/runcoms/zlogin
index 0e4683c..141a242 100644
--- a/runcoms/zlogin
+++ b/runcoms/zlogin
@@ -20,4 +20,4 @@ if (( $+commands[fortune] )); then
   print
 fi
 
-[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx
+[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx || exit 0
diff --git a/runcoms/zlogout b/runcoms/zlogout
index d898fec..c61bbf3 100644
--- a/runcoms/zlogout
+++ b/runcoms/zlogout
@@ -5,10 +5,3 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-# Print the message.
-cat <<-EOF
-
-Thank you. Come again!
-  -- Dr. Apu Nahasapeemapetilon
-EOF
-