X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/773d8b628b543b54232d207aad433821b7fdd1e8..c8d14c8c380ef2d7b691cacc47a3d3cce4d16bac:/dot/emacs?ds=sidebyside

diff --git a/dot/emacs b/dot/emacs
index f3131a9..4107fda 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -134,6 +134,11 @@
 		      (and edit
 			   (set-process-query-on-exit-flag edit nil)))))))
 
+;; Saving state.
+
+(or mdw-fast-startup (savehist-mode 1))
+(setq history-length 200)
+
 ;; Control backup behaviour.
 
 (setq backup-by-copying nil)
@@ -208,7 +213,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\\)"
@@ -593,6 +599,7 @@
   (global-set-key [?\C-c ?t ?r] 'timeclock-reread-log)
   (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
   (global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
+  (global-set-key [?\C-c ?k] 'compile)
   (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
   (global-set-key [?\M-#] 'calc-dispatch)
   (global-set-key [?\C-x ?/] 'auto-fill-mode)
@@ -616,7 +623,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 +834,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")))