X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/45d17e24fe02fc9b2552533f4b2d3c1e68905873..459c9fb2fc1ea83ebc141cc8b898c4e704eafa63:/emacs?ds=sidebyside

diff --git a/emacs b/emacs
index 194bb28..2ae4bc1 100644
--- a/emacs
+++ b/emacs
@@ -39,9 +39,11 @@
 (maybe-autoload 'cvs-update "pcl-cvs" nil t)
 (maybe-autoload 'debian-changelog-mode "debian-changelog-mode" nil t)
 (maybe-autoload 'git-status "git" nil t)
+(maybe-autoload 'git-blame-mode "git-blame" nil t)
+(maybe-autoload 'stgit "stgit" nil t)
 (and (library-exists-p "vc-git")
      (not (memq 'GIT vc-handled-backends))
-     (setq vc-handled-backends (append vc-handled-backends (list 'GIT))))
+     (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 (and (library-exists-p "quilt")
      (load "quilt"))
 
@@ -124,7 +126,7 @@
 
 ;; --- Other goodies ---
 
-(resize-minibuffer-mode 1)		;Make minibuffer grow dynamically
+(trap (resize-minibuffer-mode 1))	;Make minibuffer grow dynamically
 (auto-compression-mode 1)		;Enable automatic compression
 (setq dabbrev-case-replace nil)		;Retain case when completing
 (setq next-line-add-newlines nil)	;Don't add weird newlines
@@ -145,7 +147,8 @@
       '("-print0 | xargs -0r ls -ld" . "ld"))
 (setq Info-fontify-maximum-menu-size 60000)
 (setq ispell-dictionary "british"
-      flyspell-default-dictionary "british")
+      flyspell-default-dictionary "british"
+      ispell-silently-savep t)
 (trap
   (require 'uniquify)
   (setq uniquify-buffer-name-style 'post-forward-angle-brackets)
@@ -168,7 +171,7 @@
 	  ("ftp" . ,proxy)
 	  ("gopher" . ,proxy))))
 (setq url-cookie-untrusted-urls '("."))
-	  
+
 (setq browse-url-browser-function (mdw-good-url-browser)
       browse-url-mozilla-program "firefox")
 
@@ -316,6 +319,7 @@
       (append `(("\\.p[lm]$" . perl-mode)
 		("\\.m$" . objc-mode)
 		("\\.mxd$" . c-mode)
+		("\\.cs" . csharp-mode)
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
@@ -359,7 +363,7 @@
 (mapcar (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
 	'(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
 	  perl-mode-hook cperl-mode-hook python-mode-hook awk-mode-hook
-	  tcl-mode-hook
+	  tcl-mode-hook asm-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
@@ -372,6 +376,26 @@
 (global-font-lock-mode t)
 (defalias 'perl-mode 'cperl-mode)
 
+;;;----- SGML hacking -------------------------------------------------------
+
+(defun mdw-sgml-mode ()
+  (interactive)
+  (sgml-mode)
+  (mdw-standard-fill-prefix "")
+  (make-variable-buffer-local 'sgml-delimiters)
+  (setq sgml-delimiters
+	'("AND" "&" "COM" "--" "CRO" "&#" "DSC" "]" "DSO" "[" "DTGC" "]"
+	  "DTGO" "[" "ERO" "&" "ETAGO" ":e" "GRPC" ")" "GRPO" "(" "LIT" "\""
+	  "LITA" "'" "MDC" ">" "MDO" "<!" "MINUS" "-" "MSC" "]]" "NESTC" "{"
+	  "NET" "}" "OPT" "?" "OR" "|" "PERO" "%" "PIC" ">" "PIO" "<?"
+	  "PLUS" "+" "REFC" "." "REP" "*" "RNI" "#" "SEQ" "," "STAGO" ":"
+	  "TAGC" "." "VI" "=" "MS-START" "<![" "MS-END" "]]>"
+	  "XML-ECOM" "-->" "XML-PIC" "?>" "XML-SCOM" "<!--" "XML-TAGCE" "/>"
+	  "NULL" ""))
+  (setq major-mode 'mdw-sgml-mode)
+  (setq mode-name "[mdw] SGML")
+  (run-hooks 'mdw-sgml-mode-hook))
+
 ;;;----- Rootly editingness -------------------------------------------------
 
 (eval-after-load "tramp"
@@ -412,7 +436,8 @@
 
 ;; --- Configure lazy fontification ---
 
-(setq font-lock-support-mode 'lazy-lock-mode)
+(and (fboundp 'lazy-lock-mode)
+     (setq font-lock-support-mode 'lazy-lock-mode))
 ; (setq lazy-lock-defer-contextually t)
 (setq lazy-lock-defer-time nil)
 (setq font-lock-maximum-decoration 3)
@@ -429,6 +454,7 @@
 (add-hook 'objc-mode-hook 'mdw-fontify-c-and-c++ t)
 (add-hook 'c++-mode-hook 'mdw-fontify-c-and-c++ t)
 (add-hook 'linux-c-mode-hook #'(lambda () (setq c-basic-offset 8)))
+(add-hook 'asm-mode-hook 'mdw-fontify-asm t)
 
 (add-hook 'apcalc-mode-hook 'mdw-misc-mode-config t)
 (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t)