X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/298fab5b8c6756940b830c9db0fc42a64acb5f9f..558fc01413d875fc8098108b3f8264b72d0b5f0d:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 708817f..ed2d4d1 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -62,8 +62,13 @@
 
 (trap (or mdw-fast-startup (require 'tex-site)))
 
-(trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
+(trap (or mdw-fast-startup (semantic-load-enable-excessive-code-helpers)))
 (setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
+(eval-after-load "senator"
+  '(setq isearch-mode-hook
+	 (remq 'senator-isearch-mode-hook isearch-mode-hook)
+	 isearch-mode-end-hook
+	 (remq 'senator-isearch-mode-hook isearch-mode-end-hook)))
 
 ;; Skeleton stuff.
 
@@ -89,8 +94,12 @@
 
 (and (or window-system (>= emacs-major-version 23))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+		  edit-server-new-frame nil
 		  gnuserv-frame t)
-	    (trap (server-start))))
+	    (trap (server-start))
+	    (trap (progn
+		    (require 'edit-server)
+		    (edit-server-start)))))
 
 ;; Control backup behaviour.
 
@@ -267,6 +276,14 @@
 
 (setq w3m-default-display-inline-images t)
 
+(eval-after-load "w3m"
+  '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil)
+		    ("application/x-pdf" "\\.pdf\\'" ("evince" file) nil))))
+     (dolist (e entries)
+       (setq w3m-content-type-alist
+	     (cons e (remove* (car e) w3m-content-type-alist
+			      :key #'car :test #'string=))))))
+
 (setq w3-do-incremental-display t
       w3-use-menus '(file edit view go bookmark options
 		     buffers style search emacs nil help)