Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index f3131a9..5c567fa 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -208,7 +208,8 @@
       (lambda ()
        (let ((group gnus-newsgroup-name))
          (and (string-match "^nn\\(imap\\|folder\\)\\+" group)
-              (not (string-match ":\\(crap\\|spam\\|lists\\)\\." group)))))
+              (not (string-match ":\\(crap\\|spam\\|lists\\|corpus\\)\\."
+                                 group)))))
       bbdb-user-mail-names
       (concat "^"
              "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
@@ -616,7 +617,14 @@
   (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point)
   (global-set-key [f11] 'mdw-toggle-full-screen)
   (and (not mdw-fast-startup) (fboundp 'hippie-expand)
-       (global-set-key [?\M-/] 'hippie-expand)))
+       (global-set-key [?\M-?] 'hippie-expand)))
+
+(eval-after-load "hippie-exp"
+  '(setq hippie-expand-try-functions-list
+        (remove-if (lambda (name)
+                     (memq name '(try-expand-list
+                                  try-expand-list-all-buffers)))
+                   hippie-expand-try-functions-list)))
 
 (eval-after-load "dired"
   '(progn
@@ -820,6 +828,7 @@
 (progn
   (setq-default py-indent-offset 2
                python-indent 2
+               python-indent-offset 2
                py-python-command-args
                `("-i" "-colors" ,(if mdw-black-background
                                      "Linux" "LightBG")))