dot/emacs, dot/xinitrc: Chicanery for Emacs 26 frame-width disaster.

It seems that Emacs 26 just won't create frames at the size I ask for.
The initial frame comes out one column two wide; subsequent
frames (after a short initial delay which I still don't understand) come
out three columns too narrow.  The initial divvy still doesn't work
properly.  But things are mostly right.

diff --git a/dot/emacs b/dot/emacs
index 9dd28f2..4f1fb58 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -579,9 +579,12 @@
 ;; Default frame size.
 
 (setq frame-background-mode (if mdw-black-background 'dark 'light)
+      frame-inhibit-implied-resize t
       default-frame-alist
       `((width . ,(+ mdw-column-width
-                    (if (>= emacs-major-version 21) 0 1)))
+                    (cond ((<= emacs-major-version 20) 1)
+                          ((= emacs-major-version 26) 3)
+                          (t 0))))
        (height . 33)
        (vertical-scroll-bars . right)
        (cursor-type . bar)

diff --git a/dot/xinitrc b/dot/xinitrc
index cfbfdbd..7f31539 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -263,6 +263,7 @@ case "$e_ver" in
   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 ))