From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 22 Apr 2016 17:37:48 +0000 (+0100)
Subject: dot/xinitrc: Support for GNU Emacs 24.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/384f691a301988e46040a164a4a5d3758f62a01b?ds=sidebyside;hp=-c

dot/xinitrc: Support for GNU Emacs 24.

Notice its existence (but prefer Emacs 23 for now), and the slightly
different size parameters caused by the use of Gtk3.

For now, an initial Emacs comes up a column too narrow; another one
started later (xinitcmd :emacs) comes up the correct size.  I don't know
what's going on here.
---

384f691a301988e46040a164a4a5d3758f62a01b
diff --git a/dot/xinitrc b/dot/xinitrc
index 87e5bbd..72afe36 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -206,7 +206,7 @@ start-clients () {
 ### Main screen layout.
 
 ## Choose appropriate clients.
-emacs=$(pick_program emacs emacs23 emacs22 emacs21 emacs)
+emacs=$(pick_program emacs emacs23 emacs24 emacs22 emacs21 emacs)
 term=$(pick_program terminal pterm Eterm xterm)
 
 ## Emacs window measurements.
@@ -221,6 +221,11 @@ case "$emacs" in
     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
+    ;;
 esac
 
 ## Terminal window measurements.