X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c7203018088c17c7c5516f62b508f04680c63ca2..48bfbb038a527bfe31dd29b7656193bbe4186ea3:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 677338c..ce99762 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -330,6 +330,7 @@
 (setq find-ls-option			;Build file lists efficiently
       '("-print0 | xargs -0r ls -ld" . "ld"))
 (setq bookmark-save-flag 0)		;Save bookmarks automatically
+(setq vc-follow-symlinks t)
 (setq x-gtk-file-dialog-help-text nil)
 (setq Info-fontify-maximum-menu-size 100000)
 (setq set-mark-command-repeat-pop t)
@@ -398,8 +399,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
@@ -615,7 +616,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
@@ -819,6 +827,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")))
@@ -883,9 +892,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")
@@ -900,14 +909,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 "\"")