putty-defaults: Revert bogus change to Putty terminal height.

[profile] / xinitrc

diff --git a/xinitrc b/xinitrc
index 06adb02..4ef815b 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -25,9 +25,20 @@ if ! $xx [ -r /tmp/.esd/socket ]; then
   cleanup="$cleanup; kill $!"
 fi
 
+# --- Picking appropriate programs ---
+
+pick_program () {
+  for i in "$@"; do
+    if type -t >/dev/null "$i"; then echo "$i"; return; fi
+  done
+  echo false
+}
+
 # --- Start a nice window manager ---
 
-$xx enlightenment $EOPTS&
+: ${wm=$(pick_program enlightenment e16)}
+$tt Window manager is $wm.
+$xx $wm $EOPTS&
 
 # --- Crank up a screenlock program ---
 
@@ -43,13 +54,6 @@ $xx gnome-panel&
 # Column character width = 82; Emacs magic overhead = -2
 # Vertical line pixel height = 13; misc overhead = 52
 
-pick_program () {
-  for i in "$@"; do
-    if type -t >/dev/null "$i"; then echo "$i"; return; fi
-  done
-  echo false
-}
-
 : ${emacs=$(pick_program emacs22 emacs21)}
 $tt Using editor $emacs.
 case "$emacs" in