X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/861e478a700e9f7a762dc775d88427bbba5d6a8a..e357ccfe8e6f85c8adb5781b90cea7872e50b015:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index d091acd..e1a5d6e 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -84,7 +84,7 @@
 
 (require 'paren)
 (trap (show-paren-mode t))
-(or window-system (menu-bar-mode -1))
+(or window-system (>= emacs-major-version 22) (menu-bar-mode -1))
 
 ;; Multiple cursors.
 
@@ -443,8 +443,13 @@
 	(left-fringe . 5)
 	(right-fringe . 5)
 	(scroll-bar-width . 15)
+	(tool-bar-lines . 0)
+	(menu-bar-lines . 1)
 	(cursor-color . "red")
 	(background-mode . ,(if mdw-black-background 'dark 'light)))
+      initial-frame-alist
+      `((width . ,(if (>= emacs-major-version 21) 77 78))
+	(menu-bar-lines . ,(if window-system 1 0)))
       window-system-default-frame-alist
       '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
 	    (menu-font . "8.Helv")