dot/xinitrc: Calculate derived Emacs geometry after the version dispatch.

diff --git a/dot/xinitrc b/dot/xinitrc
index 171024247c9c3397c86e4336bb569585c2ae0ba6..fe4b440977f15a5e7a7794957192e8bc93d74da0 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -233,9 +233,8 @@ 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_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
+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_hextra=34 e_cextra=-2 e_vextra=52 ;;
   emacs22 | emacs23) e_hextra=8 e_cextra=-6 e_vextra=46 ;;
 case "$emacs" in
   emacs21 | emacs) e_hextra=34 e_cextra=-2 e_vextra=52 ;;
   emacs22 | emacs23) e_hextra=8 e_cextra=-6 e_vextra=46 ;;


@@ -243,6 +242,8 @@ case "$emacs" in
   emacs23-lucid) e_hextra=7 e_cextra=-6 e_vextra=48 ;;
   emacs24-lucid) e_hextra=7 e_cextra=-5 e_vextra=48 ;;
 esac
   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.
 ##
 
 ## Terminal window measurements.
 ##