X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/bc30f5c465d7c38c208e0eccf28b017f4d52206a..6006518e876259e718e5bffc4e45a24b8a09d88e:/emacs

diff --git a/emacs b/emacs
index 9620894..6f9bf4d 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)
@@ -130,7 +128,7 @@
       ps-landscape-mode t
       ps-number-of-columns 3
       ps-font-family 'Courier
-      ps-font-size 9)
+      ps-font-size 4)
 
 ;; --- Splash screen stuff ---
 
@@ -159,9 +157,11 @@
 (setq ange-ftp-ftp-program-name "pftp")	;Use passive FTP
 (setq find-ls-option			;Build file lists efficiently
       '("-print0 | xargs -0r ls -ld" . "ld"))
+(setq bookmark-save-flag 0)		;Save bookmarks automatically
 (setq Info-fontify-maximum-menu-size 60000)
-(setq ispell-dictionary "british"
-      flyspell-default-dictionary "british"
+(setq ispell-program-name "aspell"
+      ispell-local-dictionary "en_GB-ize-w_accents"
+      flyspell-default-dictionary "en_GB-ize-w_accents"
       ispell-silently-savep t)
 (trap
   (require 'uniquify)
@@ -171,7 +171,7 @@
 (trap
   (tooltip-mode 0)
   (tool-bar-mode 0))
-(trap (global-auto-revert-mode t))
+;;(trap (global-auto-revert-mode t))
 (setq psgml-html-build-new-buffer nil)
 
 (setq cltl2-root-url (mdw-config 'cltl-url))
@@ -394,26 +394,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"
@@ -515,6 +495,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)
@@ -529,8 +511,8 @@
 (trap
   (require 'slime-autoloads)
   (slime-setup '(slime-autodoc)))
-(trap (require 'xscheme))
-(setq-default xscheme-process-command-line "scheme -large -emacs")
+;;(trap (require 'xscheme))
+;;(setq-default xscheme-process-command-line "scheme -large -emacs")
 (add-hook 'inferior-lisp-mode-hook
 	  #'(lambda ()
 	      (local-set-key "\C-m" 'comint-send-and-indent)) t)
@@ -566,7 +548,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 *\\'"))