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

[profile] / emacs

diff --git a/emacs b/emacs
index 995afd6..7ca4cc3 100644 (file)
--- a/emacs
+++ b/emacs
@@ -266,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")
@@ -290,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)
@@ -509,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