dot/emacs: Use `window-system-default-frame-alist'.

Rather than building `default-frame-alist' conditionally according to
the prevailing `window-system'.  We can now make do without the
`mdw-set-frame-parameters' hack.

Depending on when `window-system-default-frame-alist' was introduced, we
may yet need a compatibility hack for Emacs 22.

diff --git a/dot/emacs b/dot/emacs
index d3c92516bccedfc0546fe20ebd11f863acb396fd..e5ae0b861aed09d8ef5ad17bd857171de3384136 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -382,14 +382,12 @@
         (cursor-color . "red"))
        (if mdw-black-background
           '((background-mode . dark))
         (cursor-color . "red"))
        (if mdw-black-background
           '((background-mode . dark))

-        '((background-mode . light)))
-       (and (eq window-system 'x)
-           '((font . "6x13")))
-       (and (eq window-system 'pm)
-           '((font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
-             (menu-font . "8.Helv")
-             (background-color . "lightgrey")))
-       default-frame-alist))
+        '((background-mode . light)))))
+(setq window-system-default-frame-alist
+      '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
+           (menu-font . "8.Helv")
+           (background-color . "lightgrey"))
+       (nil (menu-bar-lines . 0))))

 
 ;; Other frame fiddling.
 
 
 ;; Other frame fiddling.
 

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index e9390dd24fb6746b3477413b8a22f37a3b778f8d..a55843c3ce30ec83ad25d7ba46c450f1b1f5fe3d 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -776,17 +776,6 @@ (defun mdw-last-one-out-turn-off-the-lights (frame)
       (run-with-idle-timer 0 nil #'x-close-connection frame-display))))
 (add-hook 'delete-frame-functions 'mdw-last-one-out-turn-off-the-lights)
 
       (run-with-idle-timer 0 nil #'x-close-connection frame-display))))
 (add-hook 'delete-frame-functions 'mdw-last-one-out-turn-off-the-lights)
 

-(defvar mdw-frame-parameters-alist
-  '((nil (menu-bar-lines . 0))))
-(defun mdw-set-frame-parameters (frame)
-  (let ((params (assq (if (fboundp 'window-system)
-                         (window-system frame)
-                       window-system)
-                     mdw-frame-parameters-alist)))
-    (when params
-      (modify-frame-parameters frame (cdr params)))))
-(add-hook 'after-make-frame-functions 'mdw-set-frame-parameters)
-

 ;;;--------------------------------------------------------------------------
 ;;; General fontification.
 
 ;;;--------------------------------------------------------------------------
 ;;; General fontification.