Make Emacs column width configurable.

[profile] / dot / xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index b44bc81..1710242 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -216,7 +216,8 @@ 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.
@@ -232,22 +233,15 @@ 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_colwd=$(( e_colsz*e_charwd + e_colextra ))
+e_colchars=$(( e_colsz + 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
 
 ## Terminal window measurements.