From e357ccfe8e6f85c8adb5781b90cea7872e50b015 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Thu, 23 Jul 2015 10:13:41 +0100 Subject: [PATCH] dot/emacs, dot/Xdefaults: Refine handling of menu bar properties. Organization: Straylight/Edgeware From: Mark Wooding Terminal Emacsen shouldn't have them; windowed Emacsen should. --- dot/Xdefaults | 1 + dot/emacs | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dot/Xdefaults b/dot/Xdefaults index 5baae31..277695d 100644 --- a/dot/Xdefaults +++ b/dot/Xdefaults @@ -86,6 +86,7 @@ Emacs.menu*foreground: black Emacs.menu*background: lightgrey Emacs.scrollbar*attributeBackground: lightgrey Emacs.toolBar: 0 +Emacs.menuBar: on Emacs.verticalScrollBars: right !! VNC. 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") -- [mdw]