dot/emacs, dot/Xdefaults: Refine handling of menu bar properties.

Terminal Emacsen shouldn't have them; windowed Emacsen should.

diff --git a/dot/Xdefaults b/dot/Xdefaults
index 5baae316fe8598b0ad79d699b2c9dfd2897af06c..277695d7b7e747c47a171a9a3a37fe4e5889a3b3 100644 (file)
--- 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 d091acdb31322fe7950c409490e91d4cf1ef18b7..e1a5d6ea0085473e5bcef2df8e570b8aa2a638d3 100644 (file)
--- 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")