switch back

3 files changed, 8 insertions, 4 deletions

diff --git a/lang.csh b/lang.csh
index dfc4bad5..b119ca51 100755
--- a/lang.csh
+++ b/lang.csh
@@ -74,10 +74,12 @@ if ($sourced == 1) then
 		if ( $?TERM ) then
 		    if ( "$TERM" == "linux" ) then
 			if ( `/sbin/consoletype` == "vt" ) then
-			    if ( $?SYSFONTACM ) then
+			    if ( -x /bin/unicode_start ) then
+			      if ( $?SYSFONTACM ) then
 			        unicode_start $SYSFONT $SYSFONTACM
-			    else
+			      else
 			        unicode_start $SYSFONT
+			      endif
 			    endif
 			endif
 		    endif
diff --git a/lang.sh b/lang.sh
index 534d465c..dd16e59d 100755
--- a/lang.sh
+++ b/lang.sh
@@ -70,7 +70,7 @@ if [ "$sourced" = 1 ]; then
       case $LANG in
     	*.utf8*|*.UTF-8*)
     	if [ "$TERM" = "linux" -a "`/sbin/consoletype`" = "vt" ]; then
-		unicode_start $SYSFONT $SYSFONTACM
+		[ -x /bin/unicode_start ] && unicode_start $SYSFONT $SYSFONTACM
         fi
 	;;
       esac
diff --git a/setsysfont b/setsysfont
index 7e44a9a8..70e8c6aa 100755
--- a/setsysfont
+++ b/setsysfont
@@ -8,7 +8,9 @@ fi
 
 case "$LANG" in
     *.utf8|*.UTF-8)
-      	 exec unicode_start $SYSFONT $SYSFONTACM
+         if [ -x /bin/unicode_start ]; then
+      	    exec unicode_start $SYSFONT $SYSFONTACM
+	 fi
 	 ;;
 esac