Merge branch 'master' into hjp

.zjava

@@ -6,8 +6,8 @@
 if whence apppath > /dev/null
 then
     for i in \
+        /usr/local/jdk-10.0.1 \
         /usr/local/jdk1.8.0_112 \
-        /usr/local/jre1.6.0_14 \
 	/usr/local/java \
 	/usr/lib/java
     do
@@ -62,13 +62,4 @@ then
 	fi
     done
 
-    for i in /usr/local/openxchange
-    do
-	if [ -d "$i" ]
-	then
-	    export OX_HOME="$i"
-	    PATH=$(apppath "$i/bin" "$i/sbin")
-	    break;
-	fi
-    done
 fi

.zprofile

@@ -1,8 +1,8 @@
-#
-# $Id: .zprofile,v 1.22 2012-10-19 11:03:15 hjp Exp $
-#
 # this is sourced for login shells after .zshenv but before .zshrc
 #
+# Once upon a tim this was also sourced at the start of an Xsession, but
+# that doesn't seem to be the case for my current debian systems (with
+# lightdm/xfce) any more. So everything set here isn't available in X11.
 umask 022
 
 unset MAILCHECK

.zshenv

@@ -50,6 +50,8 @@ then
 
     # first prepend important stuff - in order of increasing priority:
 
+    setopt NULL_GLOB
+
     PATH=`$preppath -c /usr/bin/X11:/usr/games:/usr/contrib/bin`
     PATH=`$preppath -c /bin:/usr/bin`
     # Debian's open/libre office is in /usr/bin, so we need to prepend 
@@ -63,6 +65,8 @@ then
 
     # then append less important stuff
     PATH=`apppath -c /usr/local/www/offline/devel.fiw/bin`
+
+    unsetopt NULL_GLOB
 fi
 
 if [ -r /etc/MANPATH ]
@@ -273,19 +277,6 @@ case "$FQDN" in
 	;;
 esac
 
-if [ -d $HOME/go ]
-then
-    export GOROOT=$HOME/go
-    export GOOS=linux
-    case `uname  -m` in
-    x86_64)
-        export GOARCH=amd64
-        ;;
-    *)
-        export GOARCH=386
-    esac
-fi
-
 case "$FQDN" in
    tsimri.wsr.ac.at)
         export GET_PASS_FILES="/home/hjp/wrk/admin/info/pwd_work.gpg /home/hjp/Notes/pw.gpg"