From 46e405665813a040e6f537b274fca65b4594218d Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Thu, 12 May 2016 12:00:20 +0100 Subject: [PATCH] dot/xinitrc: Calculate derived Emacs geometry after the version dispatch. --- dot/xinitrc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dot/xinitrc b/dot/xinitrc index 1710242..fe4b440 100755 --- 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_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 ;; @@ -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 +e_colwd=$(( e_colsz*e_charwd + e_colextra )) +e_colchars=$(( e_colsz + e_colextrachars )) ## Terminal window measurements. ## -- 2.11.0