X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/1b239a706933a7252f4a737db92b70f294320d8f..f64c5a1a842e1998e814bfa931f21a376e905485:/dot/xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index b44bc81..8bff85f 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -216,11 +216,16 @@ start-clients () {
 ### Main screen layout.
 
 ## Choose appropriate clients.
-emacs=$(pick_program emacs emacs23 emacs24 emacs22 emacs21 emacs)
+emacs=$(pick_program emacs \
+  emacs23-lucid emacs24-lucid emacs23 emacs24 emacs22 emacs21 emacs)
 term=$(pick_program terminal pterm Eterm xterm)
 
 ## Emacs window measurements.
 ##
+## e_colsz = width of a column in characters (from `emacs-width' metaconfig)
+## e_charwd = width of a character in pixels (assume `6x13')
+## e_colextra = additional per-column overhead in pixels
+## e_colextrachars = additional per-column overhead in character units
 ## e_colwd = basic width of a column in pixels
 ## e_hextra = extra horizontal width in pixels
 ##	Width of an N-column Emacs frame in pixels will be
@@ -232,23 +237,17 @@ term=$(pick_program terminal pterm Eterm xterm)
 ## e_lineht = height of a character line in pixels
 ## e_vextra = number of additional vertical cruft pixels
 ##	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
-  emacs21 | emacs)
-    e_colwd=492 e_hextra=34
-    e_colchars=82 e_cextra=-2
-    e_lineht=13 e_vextra=52
-    ;;
-  emacs22 | emacs23)
-    e_colwd=492 e_hextra=8
-    e_colchars=82 e_cextra=-6
-    e_lineht=13 e_vextra=46
-    ;;
-  emacs24)
-    e_colwd=492 e_hextra=5
-    e_colchars=82 e_cextra=-6
-    e_lineht=13 e_vextra=42
-    ;;
+  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 ;;
 esac
+e_colwd=$(( e_colsz*e_charwd + e_colextra ))
+e_colchars=$(( e_colsz + e_colextrachars ))
 
 ## Terminal window measurements.
 ##