X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/56c3a7e735236be7ff43f95fe1a001f5245cdd81..7cdd66c595dda3d6b4dc916cb63a277bae803255:/emacs

diff --git a/emacs b/emacs
index 877bbe2..d945642 100644
--- a/emacs
+++ b/emacs
@@ -43,17 +43,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 ---
 
@@ -146,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)
@@ -169,7 +170,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))
@@ -251,6 +252,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)
@@ -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-autoloads)
-  (slime-setup '(slime-autodoc)))
-(trap (require 'xscheme))
-(setq-default xscheme-process-command-line "scheme -large -emacs")
+ (if (not mdw-fast-startup)
+     (progn
+       (require 'slime-autoloads)
+       (slime-setup '(slime-autodoc)))))
 (add-hook 'inferior-lisp-mode-hook
 	  #'(lambda ()
 	      (local-set-key "\C-m" 'comint-send-and-indent)) t)