X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/d71a646d65c0a414a1ddba439bcd8383fb7ceec8..a63efb6728ba8d0fd07a24235755c1345a9b897c:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index f64da0b..e290e5a 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1889,6 +1889,10 @@ name, as a symbol."
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 		 '(0 mdw-punct-face))))))
 
+(define-derived-mode sod-mode c-mode "Sod"
+  "Major mode for editing Sod code.")
+(push '("\\.sod$" . sod-mode) auto-mode-alist)
+
 ;;;--------------------------------------------------------------------------
 ;;; AP calc mode.
 
@@ -2630,10 +2634,10 @@ strip numbers instead."
 (defun mdw-fontify-pyrex ()
   (mdw-fontify-pythonic
    (mdw-regexps "and" "as" "assert" "break" "cdef" "class" "continue"
-		"ctypedef" "def" "del" "elif" "else" "except" "exec"
+		"ctypedef" "def" "del" "elif" "else" "enum" "except" "exec"
 		"extern" "finally" "for" "from" "global" "if"
 		"import" "in" "is" "lambda" "not" "or" "pass" "print"
-		"raise" "return" "struct" "try" "while" "with"
+		"property" "raise" "return" "struct" "try" "while" "with"
 		"yield")))
 
 ;;;--------------------------------------------------------------------------
@@ -3158,7 +3162,7 @@ strip numbers instead."
   (local-set-key [?$] 'self-insert-command)
 
   ;; Make `tab' be useful, given that tab stops in TeX don't work well.
-  (local-set-key "\C-i" 'indent-relative)
+  (local-set-key "\C-\M-i" 'indent-relative)
   (setq indent-tabs-mode nil)
 
   ;; Set fill prefix.
@@ -3677,6 +3681,9 @@ that character only to be normal punctuation.")
    "\\([ \t]*\\([>#|:] ?\\)*[ \t]*\\)" 3)
   (auto-fill-mode 1))
 
+(eval-after-load "flyspell"
+  '(define-key flyspell-mode-map "\C-\M-i" nil))
+
 ;;;--------------------------------------------------------------------------
 ;;; Outline and hide/show modes.
 
@@ -3819,6 +3826,8 @@ there is sadness."
 ;;;--------------------------------------------------------------------------
 ;;; MPC configuration.
 
+(eval-when-compile (trap (require 'mpc)))
+
 (setq mpc-browser-tags '(Artist|Composer|Performer Album|Playlist))
 
 (defun mdw-mpc-now-playing ()