X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/1a4d7e7dc6a51ad05ef719ed1b7b9db7897c050f..ef908fcaf1321d4feaa13efdbb81885b35a5fb59:/emacs

diff --git a/emacs b/emacs
index cf0ca4a..6d34822 100644
--- a/emacs
+++ b/emacs
@@ -1,4 +1,4 @@
-;;; -*-emacs-lisp-*-
+;;; -*- mode: emacs-lisp; coding: utf-8 -*-
 ;;;
 ;;; $Id: .emacs,v 1.11 1997/01/01 18:47:09 mdw Exp $
 ;;;
@@ -32,8 +32,6 @@
 
 ;; --- Load some other bits of code ---
 
-(setq load-path (cons "~/lib/emacs" load-path))
-
 (maybe-autoload 'cc-mode "cc-mode" nil t)
 (maybe-autoload 'rexx-mode "rexx-mode" nil t)
 (maybe-autoload 'cvs-update "pcl-cvs" nil t)
@@ -110,11 +108,10 @@
 ;; --- Internationalization twiddling ---
 
 (trap
-  (standard-display-european 1)
+  ;; Have top-bit-set characters work properly in terminals.
   (let ((im (current-input-mode)))
     (apply #'set-input-mode
-	   (nconc (list (nth 0 im) (nth 1 im) 0) (nthcdr 3 im))))
-  (set-language-environment "Latin-1"))
+	   (nconc (list (nth 0 im) (nth 1 im) 0) (nthcdr 3 im)))))
 
 ;; --- Don't disable any commands ---
 
@@ -395,26 +392,6 @@
 (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"
@@ -516,6 +493,8 @@
 (add-hook 'latex-mode-hook 'mdw-fontify-tex t)
 
 (add-hook 'sh-mode-hook #'mdw-setup-sh-script-mode)
+(add-hook 'autoconf-mode-hook #'mdw-setup-m4)
+(add-hook 'm4-mode-hook #'mdw-setup-m4)
 
 (add-hook 'smalltalk-mode-hook 'mdw-fontify-smalltalk t)
 (add-hook 'smalltalk-mode-hook 'mdw-setup-smalltalk t)
@@ -567,7 +546,7 @@
 
 ;; --- Make the shell mode aware of my prompt ---
 
-(setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *")
+(setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *")
 (setq comint-password-prompt-regexp
       (concat "\\(\\([Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
 	      "[Pp]assword\\|pass phrase\\):\\s *\\'"))