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

diff --git a/dot/emacs b/dot/emacs
index 677338c..757306b 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -97,6 +97,9 @@
 (require 'paren)
 (trap (show-paren-mode t))
 (or window-system (mdw-emacs-version-p 22) (menu-bar-mode -1))
+(setq x-select-enable-clipboard nil
+      x-select-enable-primary t
+      mouse-drag-copy-region t)
 
 ;; Multiple cursors.
 
@@ -134,6 +137,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 +216,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\\)"
@@ -330,6 +339,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 +408,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
@@ -592,6 +602,16 @@
   (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 ?m ?m] 'magit-status)
+  (global-set-key [?\C-c ?m ?d] 'magit-dispatch-popup)
+  (global-set-key [?\C-c ?m ?w] 'magit-wip-log)
+  (global-set-key [?\C-c ?m ?r] 'magit-list-repositories)
+  (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause)
+  (global-set-key [?\C-c ?p ?s] 'mpc-stop)
+  (global-set-key [?\C-c ?p ?<] 'mpc-prev)
+  (global-set-key [?\C-c ?p ?>] 'mpc-next)
+  (global-set-key [?\C-c ?p ??] 'mdw-mpc-now-playing)
+  (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)
@@ -615,7 +635,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
@@ -726,7 +753,7 @@
 	lisp-mode-hook lisp-interaction-mode-hook makefile-mode-hook
 	inferior-lisp-mode-hook slime-repl-mode-hook
 	sml-mode-hook haskell-mode-hook erlang-mode-hook
-	smalltalk-mode-hook rexx-mode-hook
+	smalltalk-mode-hook rexx-mode-hook lua-mode-hook
 	arm-assembler-mode-hook))
 
 (global-font-lock-mode t)
@@ -799,6 +826,7 @@
   (add-hook 'go-mode-hook 'mdw-fontify-go t)
   (add-hook 'rust-mode-hook 'mdw-fontify-rust t)
 
+  (add-hook 'lua-mode-hook 'mdw-fontify-lua t)
   (add-hook 'icon-mode-hook 'mdw-fontify-icon t)
 
   (add-hook 'apcalc-mode-hook 'mdw-misc-mode-config t)
@@ -819,6 +847,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 +912,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 +929,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 "\"")