X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/2ed3b3fa7a65031a56b7716a0e5d734559c49b2e..652ff1add948209b4d55f461b04c5d54d1d8ad7b:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index e7e28c3..5c567fa 100644
--- 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\\)"
@@ -399,8 +400,8 @@
       w3m-use-cookies t)
 
 (eval-after-load "w3m"
-  '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil)
-		    ("application/x-pdf" "\\.pdf\\'" ("evince" file) nil))))
+  '(let ((entries '(("application/pdf" "\\.pdf\\'" ("xdg-open" file) nil)
+		    ("application/x-pdf" "\\.pdf\\'" ("xdg-open" file) nil))))
      (dolist (e entries)
        (setq w3m-content-type-alist
 	     (cons e (remove* (car e) w3m-content-type-alist
@@ -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")))
@@ -884,9 +893,9 @@
 (setq TeX-output-view-style
       '(("^dvi$"
 	 ("^landscape$" "^pstricks$\\|^pst-\\|^psfrag$")
-	 "%(o?)dvips -t landscape %d -o && evince %f")
+	 "%(o?)dvips -t landscape %d -o && xdg-open %f")
 	("^dvi$" "^pstricks$\\|^pst-\\|^psfrag$"
-	 "%(o?)dvips %d -o && evince %f")
+	 "%(o?)dvips %d -o && xdg-open %f")
 	("^dvi$"
 	 ("^a4\\(?:dutch\\|paper\\|wide\\)\\|sem-a4$" "^landscape$")
 	 "%(o?)xdvi %dS -paper a4r -s 0 %d")
@@ -901,14 +910,17 @@
 	("^dvi$" "^legalpaper$" "%(o?)xdvi %dS -paper legal %d")
 	("^dvi$" "^executivepaper$" "%(o?)xdvi %dS -paper 7.25x10.5in %d")
 	("^dvi$" "." "%(o?)xdvi %dS %d")
-	("^pdf$" "." "evince %o")
-	("^html?$" "." "netscape %o")))
+	("^pdf$" "." "xdg-open %o")
+	("^html?$" "." "sensible-browser %o")))
+
+(setq TeX-view-program-list
+      '(("mupdf" "mupdf %o" (mode-io-correlate " %(outpage)"))))
 
 (setq TeX-view-program-selection
       '(((output-dvi style-pstricks) "dvips and gv")
 	(output-dvi "xdvi")
-	(output-pdf "Evince")
-	(output-html "xdg-open")))
+	(output-pdf "mupdf")
+	(output-html "sensible-browser")))
 
 (setq TeX-open-quote "\""
       TeX-close-quote "\"")