X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/b04f090f76e65f6e5f1615170b4a6ca29821a298..2ed3b3fa7a65031a56b7716a0e5d734559c49b2e:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 1d902a6..e7e28c3 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -33,8 +33,8 @@
     (if (file-exists-p boot)
 	(load boot))))
 
-(require 'dot-emacs)
 (require 'cl)
+(require 'dot-emacs)
 
 ;;;--------------------------------------------------------------------------
 ;;; Some random initialisation.
@@ -172,6 +172,8 @@
       send-mail-function 'sendmail-send-it
       mail-interactive t
       sendmail-error-reporting-interactive '("-odb" "-oee"))
+(autoload 'sendmail-send-it "sendmail")
+(autoload 'smtpmail-send-it "smtpmail")
 
 (setq mail-user-agent 'message-user-agent
       read-mail-command 'gnus)
@@ -212,7 +214,10 @@
 	      "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
 		    "\\([-+][^@]*\\|\\)"
 		    "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
-	      "\\|" "\\(mdw\\(\\+[^@]*\\)?\\|0mdwk\\.[^@]*\\)" "@"
+	      "\\|" "\\(" "\\(mdw\\|mwooding\\)"
+			  "\\(\\+[^@]*\\)?"
+		    "\\|" "0" "\\(mdw\\|mwooding\\)" "k\\.[^@]*"
+		    "\\)" "@"
 		    "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk"
 	      "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
 	      "\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
@@ -240,6 +245,7 @@
 		   (member (md5 addr)
 			   '("8815c5583970856799c85a3ee0eb6a9f" ;work wiki spam
 			     "0b94ab4d25dacaa5ac07243a09c9e22e" ;work bug spam
+			     "35fb1633379a1e4d4be3b139cae20111" ;work crucible spam
 			     ))
 		   (and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr)
 			(string= (md5 (match-string 2 addr))
@@ -306,14 +312,15 @@
 (setq read-quoted-char-radix 16)	;C-q HEX-STUFF [RET]
 (setq case-fold-file-names nil)		;Don't translate file names (grr...)
 (setq scroll-step 5)			;Don't scroll too much at a time
-(setq-default fill-column 77)		;I use rather narrow windows
+(setq-default fill-column mdw-text-width) ;I use rather narrow windows
 (setq-default comment-column 40)	;Set a standard comment column
 (setq-default truncate-partial-width-windows nil
 	      truncate-lines t)
 (setq default-indicate-empty-lines t)
 (setq view-read-only t)
-(setq whitespace-style
-      '(trailing space-before-tab space-after-tab empty indentation face))
+(setq whitespace-style '(trailing empty indentation face lines-tail
+			 space-before-tab space-after-tab)
+      whitespace-line-column mdw-text-width)
 (setq woman-use-own-frame nil		;Keep man pages somewhere sensible
       woman-fill-column 72)		;Right margin position.
 (setq diff-switches "-u"		;I like reading unified diffs
@@ -323,6 +330,7 @@
 (setq find-ls-option			;Build file lists efficiently
       '("-print0 | xargs -0r ls -ld" . "ld"))
 (setq bookmark-save-flag 0)		;Save bookmarks automatically
+(setq vc-follow-symlinks t)
 (setq x-gtk-file-dialog-help-text nil)
 (setq Info-fontify-maximum-menu-size 100000)
 (setq set-mark-command-repeat-pop t)
@@ -341,7 +349,10 @@
   (setq uniquify-buffer-name-style 'post-forward-angle-brackets)
   (setq uniquify-after-kill-buffer-p t))
 (transient-mark-mode t)
-(setq mark-even-if-inactive t)
+(setq mark-even-if-inactive t
+      shift-select-mode nil
+      delete-active-region nil
+      delete-selection-mode nil)
 (trap
   (tooltip-mode 0)
   (tool-bar-mode 0))
@@ -523,7 +534,8 @@
 
 (setq frame-background-mode (if mdw-black-background 'dark 'light)
       default-frame-alist
-      `((width . ,(if (>= emacs-major-version 21) 77 78))
+      `((width . ,(+ mdw-column-width
+		     (if (>= emacs-major-version 21) 0 1)))
 	(height . 33)
 	(vertical-scroll-bars . right)
 	(cursor-type . bar)
@@ -536,7 +548,8 @@
 	(cursor-color . "red")
 	(background-mode . ,frame-background-mode))
       initial-frame-alist
-      `((width . ,(if (>= emacs-major-version 21) 77 78))
+      `((width . ,(+ mdw-column-width
+		     (if (>= emacs-major-version 21) 0 1)))
 	(menu-bar-lines . ,(if window-system 1 0)))
       window-system-default-frame-alist
       '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
@@ -663,7 +676,6 @@
 			  "\\)$")
 		 . text-mode)
 		("\\.calc?$" . apcalc-mode)
-		("/src/linux/.*\\.\\(c\\|h\\|cc\\)$" . linux-c-mode)
 		("/\\(s\\|sh\\)/" . arm-assembler-mode)
 		("\\.\\(cmd\\|exec\\|rexx\\)$" . rexx-mode)
 		("\\.st$" . smalltalk-mode)
@@ -784,7 +796,6 @@
   (add-hook 'c-mode-hook 'mdw-fontify-c-and-c++ t)
   (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 'go-mode-hook 'mdw-fontify-go t)
   (add-hook 'rust-mode-hook 'mdw-fontify-rust t)