X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/b906a1f9fe170079528aae1e94c9652005b8ab19..807c317e99426f8379fc55fc4d4bc98e67ec0f41:/dot/xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index a2af5c3..89105c1 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -221,9 +221,23 @@ start-clients () {
 
 ## Choose appropriate clients.
 emacs=$(pick_program emacs \
-  emacs24-lucid emacs23-lucid emacs24 emacs23 emacs22 emacs21 emacs)
+  emacs24-lucid emacs23-lucid emacs24 emacs23 emacs22 emacs21 \
+  emacs-lucid emacs)
 term=$(pick_program terminal pterm Eterm xterm)
 
+## If we fell back to an unversioned Emacs binary, then figure out what
+## version it actually is.
+case $emacs in
+  emacs | emacs-lucid)
+    set -- $($emacs --version | head -n1)
+    e_ver=emacs${3%%.*}${emacs#emacs}
+    ;;
+  *)
+    e_ver=$emacs
+    ;;
+esac
+info emacs-version = $e_ver
+
 ## Emacs window measurements.
 ##
 ## e_colsz = width of a column in characters (from `emacs-width' metaconfig)
@@ -243,12 +257,13 @@ term=$(pick_program terminal pterm Eterm xterm)
 ##	So an N-line Emacs frame takes N*e_lineht + e_vextra pixels
 e_colsz=$(mdw-conf emacs-width 77) e_charwd=6
 e_colextra=30 e_colextrachars=5 e_lineht=13
-case "$emacs" in
+case "$e_ver" in
   emacs21 | emacs) e_hextra=34 e_cextra=-2 e_vextra=52 ;;
   emacs22 | emacs23) e_hextra=8 e_cextra=-6 e_vextra=46 ;;
   emacs24) e_hextra=5 e_cextra=-6 e_vextra=42 ;;
   emacs23-lucid) e_hextra=7 e_cextra=-6 e_vextra=48 ;;
   emacs24-lucid) e_hextra=7 e_cextra=-5 e_vextra=48 ;;
+  emacs26-lucid) e_hextra=5 e_cextra=-6 e_vextra=51 ;;
 esac
 e_colwd=$(( e_colsz*e_charwd + e_colextra ))
 e_colchars=$(( e_colsz + e_colextrachars ))
@@ -263,10 +278,10 @@ case "$term" in
     ## The pterm width differs according to whether it's linked against Gtk 2
     ## or 3.  Let's find out...
     case $(ldd $(command -v pterm) | grep libgtk) in
-      libgtk-2*) t_wd=504 ;;
-      *) t_wd=500 ;;
+      *libgtk-2* | *libgtk-x11-2*) t_wd=504 ;;
+      *) t_wd=503 ;;
     esac
-    t_lineht=13 t_vextra=23 geom=-geometry;;
+   t_lineht=13 t_vextra=23 geom=-geometry;;
   Eterm) t_wd=504 t_lineht=13 t_vextra=23 geom=-g;;
   xterm) t_wd=507 t_lineht=13 t_vextra=27 geom=-geometry;;
 esac
@@ -426,7 +441,7 @@ EOF
 	eval "${line#!}"
 	;;
       *)
-	set -- $line
+	eval "set -- $line"
 	run bgclients "$@"
 	;;
     esac