X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/1a4d7e7dc6a51ad05ef719ed1b7b9db7897c050f..ea09c6cb7ff01f29a7e8ed5afdf67b9ec5376012:/emacs diff --git a/emacs b/emacs index cf0ca4a..4d053e5 100644 --- a/emacs +++ b/emacs @@ -1,6 +1,4 @@ -;;; -*-emacs-lisp-*- -;;; -;;; $Id: .emacs,v 1.11 1997/01/01 18:47:09 mdw Exp $ +;;; -*- mode: emacs-lisp; coding: utf-8 -*- ;;; ;;; Emacs configuration file ;;; @@ -32,8 +30,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) @@ -45,17 +41,14 @@ (not (memq 'GIT vc-handled-backends)) (setq vc-handled-backends (cons 'GIT vc-handled-backends))) (and (library-exists-p "quilt") + (not mdw-fast-startup) (load "quilt")) -(trap - (or (fboundp 'make-regexp) - (load "make-regexp"))) - -(trap (require 'tex-site)) +(trap (or mdw-fast-startup (require 'tex-site))) ;; --- Skeleton stuff --- -(trap (require 'skel-init)) +(trap (or mdw-fast-startup (require 'skel-init))) ;; --- Window system-dependent things --- @@ -85,6 +78,15 @@ (setq backup-by-copying-when-linked t) (setq backup-by-copying-when-mismatch t) +(setq mdw-backup-disable-regexps + '("/\\.git/COMMIT_EDITMSG$" + "/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$")) + +;; --- Safe variables --- + +(setq safe-local-variable-values + '((make-backup-files . nil))) + ;; --- Calculator fiddling --- (setq calc-settings-file "~/.emacs-calc") @@ -100,21 +102,13 @@ (setq rmail-display-summary t) (setq rmail-file-name "~/Mail/rmail") -;; --- GNUS configuration --- - -(setq gnus-select-method '(nntp "tux.nsict.org")) -(setq gnus-read-active-file 'some) -(setq gnus-inhibit-startup-message t) -(setq gnus-large-newsgroup 500) - ;; --- 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 --- @@ -131,7 +125,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 --- @@ -149,20 +143,24 @@ (setq dired-deletion-confirmer ;Make deletion easier in dired (symbol-function 'y-or-n-p)) (setq dired-listing-switches "-alF") ;Do `ls -F' things in dired windows +(setq wdired-allow-to-change-permissions t) (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 comment-column 40) ;Set a standard comment column (setq-default truncate-partial-width-windows nil) +(setq woman-use-own-frame nil) ;Keep man pages somewhere sensible (setq diff-switches "-u" ;I like reading unified diffs cvs-diff-flags (list diff-switches)) (setq echo-keystrokes 10) ;Long delay before keystrokes echo (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) @@ -172,9 +170,11 @@ (trap (tooltip-mode 0) (tool-bar-mode 0)) -(trap (global-auto-revert-mode t)) +(trap (or mdw-fast-startup (global-auto-revert-mode t))) (setq psgml-html-build-new-buffer nil) +(defvar mdw-black-background t) + (setq cltl2-root-url (mdw-config 'cltl-url)) (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url)) @@ -200,12 +200,22 @@ ;;;----- Calendar configuration --------------------------------------------- +(setq diary-file "~/etc/diary") + ;; --- Trivial stuff for the sunrise/sunset calculations --- (setq calendar-latitude 52.2) (setq calendar-longitude 0.1) (setq calendar-location-name "Cambridge, UK") +;; --- Holidays --- + +(and (not mdw-fast-startup) + (trap + (require 'ew-hols) + (setq other-holidays (append english-and-welsh-bank-holidays + other-holidays)))) + ;; --- Date format fiddling --- (setq european-calendar-style t) @@ -242,7 +252,7 @@ (let ((view-diary-entries-initially t)) (calendar)))) -(defvar mdw-black-background t) +;;;----- MailCrypt ---------------------------------------------------------- ;; --- Define more mode hooks for MailCrypt --- @@ -254,6 +264,7 @@ (trap (and (string-match "linux" (symbol-name system-type)) + (not mdw-fast-startup) (progn (require 'mailcrypt-init) (require 'mailcrypt) (setq mc-default-scheme 'mc-scheme-gpg) @@ -395,26 +406,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" "" "PIO" "" - "XML-ECOM" "-->" "XML-PIC" "?>" "XML-SCOM" "