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

diff --git a/emacs b/emacs
index 0d640fe..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,13 +32,13 @@
 
 ;; --- 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)
 (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 (cons 'GIT vc-handled-backends)))
@@ -108,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 ---
 
@@ -122,6 +121,21 @@
 
 (mdw-divvy-window)
 
+;; --- Postscript printing ---
+
+(setq ps-paper-type 'a4
+      ps-print-color-p nil
+      ps-landscape-mode t
+      ps-number-of-columns 3
+      ps-font-family 'Courier
+      ps-font-size 4)
+
+;; --- Splash screen stuff ---
+
+(or window-system
+    (setq inhibit-splash-screen t
+	  inhibit-startup-message t))
+
 ;; --- Other goodies ---
 
 (trap (resize-minibuffer-mode 1))	;Make minibuffer grow dynamically
@@ -143,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)
@@ -155,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))
@@ -264,7 +280,10 @@
 	 (vertical-scroll-bars . right))
        (and window-system
 	    '((cursor-type . bar)
-	      (cursor-blink . t)))
+	      (cursor-blink . t)
+	      (left-fringe . 5)
+	      (right-fringe . 5)
+	      (scroll-bar-width . 15)))
        '((cursor-color . "red"))
        (if mdw-black-background
 	   '((background-color . "black")
@@ -288,6 +307,7 @@
   (windmove-default-keybindings)
   (setq windmove-wrap-around t))
 (trap (iswitchb-mode))
+(global-set-key "\M-#" 'calc-dispatch)
 (global-set-key [f4] 'query-replace-regexp)
 (global-set-key [f5] 'goto-line)
 (global-set-key [f6] 'auto-fill-mode)
@@ -374,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"
@@ -495,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)
@@ -507,10 +509,10 @@
 (add-hook 'slime-repl-mode-hook 'mdw-fontify-lispy t)
 (add-hook 'lisp-mode-hook 'mdw-common-lisp-indent t)
 (trap
-  (require 'slime)
-  (slime-setup :autodoc t))
-(trap (require 'xscheme))
-(setq-default xscheme-process-command-line "scheme -large -emacs")
+  (require 'slime-autoloads)
+  (slime-setup '(slime-autodoc)))
+;;(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)
@@ -546,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 *\\'"))