From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 19 May 2014 09:09:44 +0000 (+0100)
Subject: dot/emacs, dot/Xdefaults: Fix default frame width.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/294db17fa591258f1112f56976a6facf87b81c17?ds=inline

dot/emacs, dot/Xdefaults: Fix default frame width.

Two changes over the years.  Firstly, Emacs later than 21 (I think) have
fringes in which they display overflow markers, rather than needing a
text column for them, so we should set the default (one-column) frame
width to 77, rather than 78.  Secondly, I use very narrow fringes, so
Emacs's initial estimate of the frame width comes out wrong, so we need
to fiddle with the X resource.
---

diff --git a/dot/Xdefaults b/dot/Xdefaults
index d271429..10320e7 100644
--- a/dot/Xdefaults
+++ b/dot/Xdefaults
@@ -71,7 +71,7 @@ XConsole*foreground:		#54ff9f
 XConsole*geometry:		485x455
 
 !! Emacs.
-emacs.geometry:			77x33
+emacs.geometry:			76x33
 Emacs.pane.menubar.font:	NICEFONT
 Emacs.menu*.font:		NICEFONT
 Emacs.font:			FIXED
diff --git a/dot/emacs b/dot/emacs
index 4705e7e..1e46f34 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -417,7 +417,7 @@
 
 (setq default-frame-alist
       (mdw-uniquify-alist
-       '((width . 78)
+       `((width . ,(if (>= emacs-major-version 21) 77 78))
 	 (height . 33)
 	 (vertical-scroll-bars . right)
 	 (cursor-type . bar)
@@ -425,10 +425,8 @@
 	 (left-fringe . 5)
 	 (right-fringe . 5)
 	 (scroll-bar-width . 15)
-	 (cursor-color . "red"))
-       (if mdw-black-background
-	   '((background-mode . dark))
-	 '((background-mode . light)))))
+	 (cursor-color . "red")
+	 (background-mode . ,(if mdw-black-background 'dark 'light)))))
 (setq window-system-default-frame-alist
       '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
 	    (menu-font . "8.Helv")