dot/emacs: Reformat frame-list settings stanza.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 583cb96..d091acd 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -93,6 +93,12 @@
 (autoload 'mdw-multiple-cursors-keymap "mdw-multiple-cursors.el"
   "A keymap for Magnar Sveen's awesome multiple-cursors." nil 'keymap)
 
+;; Rust mode.
+
+(setq load-path (nconc load-path (list "~/lib/emacs/rust-mode/")))
+(autoload 'rust-mode "rust-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
+
 ;; Temporary directory handling.
 
 (defun mdw-check-dir-exists (dir)
@@ -125,7 +131,8 @@
 
 (setq mdw-backup-disable-regexps
       '("/\\.git/COMMIT_EDITMSG$"
-       "/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$"))
+       "/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$"
+       "^/tmp/" "^/var/tmp/"))
 
 ;; Safe variables.
 
@@ -428,21 +435,23 @@
 ;; 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)
+       (cursor-color . "red")
+       (background-mode . ,(if mdw-black-background 'dark 'light)))
+      window-system-default-frame-alist
       '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
            (menu-font . "8.Helv")
            (background-color . "lightgrey"))
+       (w32 (font . "fixed613 10")
+            (background-color . "black")
+            (foreground-color . "white"))
        (nil (menu-bar-lines . 0))))
 
 ;; Other frame fiddling.
@@ -456,6 +465,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)
@@ -494,6 +505,9 @@
                  #'(lambda () (interactive)))
   (global-set-key [M-S-mouse-3] 'imenu)
   (global-set-key [XF86WakeUp] "")
+  (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point)
+  (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point)
+  (global-set-key [f11] 'mdw-toggle-full-screen)
   (and (not mdw-fast-startup) (fboundp 'hippie-expand)
        (global-set-key [?\M-/] 'hippie-expand)))
 
@@ -530,7 +544,7 @@
 ;; Recognising types of files.
 
 (setq auto-mode-alist
-      (append `(("\\.p[lm]$" . perl-mode)
+      (append `(("\\.p[lm]$" . cperl-mode)
                ("\\.m$" . objc-mode)
                ("\\.mxd$" . c-mode)
                ("\\.cs$" . csharp-mode)
@@ -572,11 +586,12 @@
       (append `(("runlisp" . lisp-mode)
                ("@BASH@" . sh-mode)
                ("@PYTHON@" . python-mode)
-               ("@PERL@" . perl-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
@@ -600,7 +615,7 @@
        tcl-mode-hook go-mode-hook js-mode-hook javascript-mode-hook
        conf-mode-hook m4-mode-hook autoconf-mode-hook autotest-mode-hook
        a68-mode-hook a68-mode-hooks asm-mode-hook fsharp-mode-hook
-       scala-mode-hook TeX-mode-hook LaTeX-mode-hook
+       scala-mode-hook rust-mode-hook TeX-mode-hook LaTeX-mode-hook
        TeXinfo-mode-hook tex-mode-hook latex-mode-hook
        texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
        lisp-mode-hook lisp-interaction-mode-hook makefile-mode-hook
@@ -610,7 +625,6 @@
        arm-assembler-mode-hook))
 
 (global-font-lock-mode t)
-(defalias 'perl-mode 'cperl-mode)
 
 ;;;--------------------------------------------------------------------------
 ;;; Rootly editingness.
@@ -679,6 +693,7 @@
   (add-hook 'linux-c-mode-hook #'(lambda () (setq c-basic-offset 8)))
   (add-hook 'asm-mode-hook 'mdw-fontify-asm t)
   (add-hook 'go-mode-hook 'mdw-fontify-go t)
+  (add-hook 'rust-mode-hook 'mdw-fontify-rust t)
 
   (add-hook 'icon-mode-hook 'mdw-fontify-icon t)