Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

[profile] / emacs

diff --git a/emacs b/emacs
index bae4138..f47f77b 100644 (file)
--- a/emacs
+++ b/emacs
@@ -1,7 +1,5 @@
 ;;; -*- mode: emacs-lisp; coding: utf-8 -*-
 ;;;
-;;; $Id: .emacs,v 1.11 1997/01/01 18:47:09 mdw Exp $
-;;;
 ;;; Emacs configuration file
 ;;;
 ;;; (c) 1996-1999 Mark Wooding
@@ -80,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")
@@ -133,6 +140,8 @@
 (setq dabbrev-case-replace nil)                ;Retain case when completing
 (setq next-line-add-newlines nil)      ;Don't add weird newlines
 (setq split-height-threshold 45)       ;Reuse windows where sensible
+(setq display-buffer-reuse-frames nil  ;Don't confuse me by showing buffers
+      iswitchb-default-method 'samewindow) ;in other random frames
 (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
@@ -166,6 +175,8 @@
 (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))
 
@@ -191,12 +202,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)
@@ -233,7 +254,7 @@
       (let ((view-diary-entries-initially t))
        (calendar))))
 
-(defvar mdw-black-background t)
+;;;----- MailCrypt ----------------------------------------------------------
 
 ;; --- Define more mode hooks for MailCrypt ---