From 773d8b628b543b54232d207aad433821b7fdd1e8 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 24 May 2016 10:32:06 +0100
Subject: [PATCH] dot/emacs, dot/vm: Hack the applications used for viewing
 content.

Mostly, leave the choice to the XDG machinery.  I'm trying `mupdf'
experimentally as my primary PDF viewer.
---
 dot/emacs | 19 +++++++++++--------
 dot/vm    | 16 ++++++++--------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/dot/emacs b/dot/emacs
index e7e28c3..f3131a9 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -399,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
@@ -884,9 +884,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 +901,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 "\"")
diff --git a/dot/vm b/dot/vm
index b28498c..28a11cb 100644
--- a/dot/vm
+++ b/dot/vm
@@ -39,15 +39,15 @@
   '("hibachi-dealers-members@chiark\\.greenend\\.org\\.uk"))
 
 (setq vm-mime-external-content-types-alist
-      '(("image/jpeg" "display")
-	("image/jpg" "display")
-	("image/gif" "display")
-	("image/bmp" "display")
-	("image/tiff" "display")
-	("application/postscript" "evince")
-	("application/pdf" "evince")))
+      '(("image/jpeg" "xdg-open")
+	("image/jpg" "xdg-open")
+	("image/gif" "xdg-open")
+	("image/bmp" "xdg-open")
+	("image/tiff" "xdg-open")
+	("application/postscript" "xdg-open")
+	("application/pdf" "xdg-open")))
 
-(setq vm-url-browser "firefox")
+(setq vm-url-browser "sensible-browser")
 
 (setq vm-frame-parameter-alist
       '((folder ((width . 81) (height . 33)))
-- 
2.11.0