From 0027bcddb5476c403ad1147b476ddf2c55f533d5 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Wed, 24 Oct 2012 11:53:24 +0900
Subject: [PATCH] return xinitrc when invalid situation

---
 xinitrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xinitrc b/xinitrc
index de31f75..d1d0f48 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,3 +1,6 @@
+test -n "$DISPLAY" || return
+test -z "$ROXTERM_PID" || return
+
 test "`hostname`" == "arch-aspireone" &&
 setxkbmap -model "acer_laptop" -layout "jp" # this line must comes first