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

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 1550b13..e1a5d6e 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.
 
@@ -435,18 +435,22 @@
 ;; Default frame size.
 
 (setq default-frame-alist
-      (mdw-uniquify-alist
-       `((width . ,(if (>= emacs-major-version 21) 77 78))
-        (height . 33)
-        (vertical-scroll-bars . right)
-        (cursor-type . bar)
-        (cursor-blink . t)
-        (left-fringe . 5)
-        (right-fringe . 5)
-        (scroll-bar-width . 15)
-        (cursor-color . "red")
-        (background-mode . ,(if mdw-black-background 'dark 'light)))))
-(setq window-system-default-frame-alist
+      `((width . ,(if (>= emacs-major-version 21) 77 78))
+       (height . 33)
+       (vertical-scroll-bars . right)
+       (cursor-type . bar)
+       (cursor-blink . t)
+       (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")
            (background-color . "lightgrey"))
@@ -466,6 +470,8 @@
 (setq windmove-wrap-around t)
 (trap (iswitchb-mode))
 (progn
+  (global-set-key [?\e ?\e] 'mdw-wrong)
+  (global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit)
   (global-set-key [?\C-x ?w left] 'windmove-left)
   (global-set-key [?\C-x ?w ?h] 'windmove-left)
   (global-set-key [?\C-x ?w up] 'windmove-up)
@@ -586,11 +592,11 @@
                ("@BASH@" . sh-mode)
                ("@PYTHON@" . python-mode)
                ("@PERL@" . cperl-mode)
-               ("/perl" . cperl-mode)
+               ("perl" . cperl-mode)
                ("@TCLSH@" . tcl-mode)
                ("@WISH@" . tcl-mode)
-               ("/tclsh" . tcl-mode)
-               ("/wish" . tcl-mode))
+               ("tclsh" . tcl-mode)
+               ("wish" . tcl-mode))
              interpreter-mode-alist))
 
 (setq completion-ignored-extensions