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

diff --git a/emacs b/emacs
index 0d640fe..7ca4cc3 100644
--- a/emacs
+++ b/emacs
@@ -39,6 +39,8 @@
 (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)))
@@ -264,7 +266,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 +293,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)
@@ -507,8 +513,8 @@
 (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))
+  (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