X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/8df912e4f47928e29776086741ef57eb067aeb5c..6fc9ca849c1b9597c535885cc7c11a88c20ebd6f:/dot-emacs.el

diff --git a/dot-emacs.el b/dot-emacs.el
index e10f9ed..e2e8998 100644
--- a/dot-emacs.el
+++ b/dot-emacs.el
@@ -1,4 +1,4 @@
-;;; -*-emacs-lisp-*-
+;;; -*- mode: emacs-lisp; coding: utf-8 -*-
 ;;;
 ;;; $Id$
 ;;;
@@ -580,13 +580,15 @@ doesn't cope with anything approximating a complicated case."
       ,@(cond ((eq window-system 'w32)
 	       '(:family "courier new" :height 85))
 	      ((eq window-system 'x)
-	       '(:family "misc-fixed" :width semi-condensed))))
+	       '(:family "misc-fixed" :height 130 :width semi-condensed))))
     (fixed-pitch)
     (minibuffer-prompt)
-    (modeline :foreground "blue" :background "yellow"
-	      :box (:line-width 1 :style released-button))
+    (mode-line :foreground "blue" :background "yellow"
+	       :box (:line-width 1 :style released-button))
+    (mode-line-inactive :foreground "yellow" :background "blue"
+			:box (:line-width 1 :style released-button))
     (scroll-bar :foreground "black" :background "lightgrey")
-    (fringe :foreground "yellow" :background "grey30")
+    (fringe :foreground "yellow" :background "black")
     (show-paren-match-face :background "darkgreen")
     (show-paren-mismatch-face :background "red")
     (font-lock-warning-face :background "red" :weight bold)
@@ -603,6 +605,9 @@ doesn't cope with anything approximating a complicated case."
     (mdw-number-face :foreground "yellow")
     (font-lock-function-name-face :weight bold)
     (font-lock-variable-name-face :slant italic)
+    (font-lock-comment-delimiter-face
+       :foreground ,(if window-system "SeaGreen1" "green")
+       :slant italic)
     (font-lock-comment-face
        :foreground ,(if window-system "SeaGreen1" "green")
        :slant italic)
@@ -656,7 +661,7 @@ doesn't cope with anything approximating a complicated case."
 				  (label . 0)
 				  (case-label . +)
 				  (access-label . -)
-				  (inclass . ++)
+				  (inclass . +)
 				  (inline-open . ++)
 				  (statement-cont . 0)
 				  (statement-case-intro . +)))
@@ -1641,6 +1646,26 @@ strip numbers instead."
 	 (list "[$^_{}#&]"
 	       '(0 mdw-punct-face)))))
 
+;;;----- 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))
+
 ;;;----- Shell scripts ------------------------------------------------------
 
 (defun mdw-setup-sh-script-mode ()
@@ -1914,6 +1939,9 @@ strip numbers instead."
   (and mdw-auto-indent
        (indent-for-tab-command)))
 
+(defun mdw-setup-m4 ()
+  (mdw-standard-fill-prefix "\\([ \t]*\\(?:#+\\|\\<dnl\\>\\)[ \t]*\\)"))
+
 ;;;----- Text mode ----------------------------------------------------------
 
 (defun mdw-text-mode ()
@@ -1931,7 +1959,7 @@ strip numbers instead."
 	    'comint-watch-for-password-prompt))
 
 (defun mdw-term-mode-setup ()
-  (setq term-prompt-regexp "^[^]#$%>»}\n]*[]#$%>»}] *")
+  (setq term-prompt-regexp "^[^]#$%>»}\n]*[]#$%>»}] *")
   (make-local-variable 'mouse-yank-at-point)
   (make-local-variable 'transient-mark-mode)
   (setq mouse-yank-at-point t)