X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/0620e1d79679f6bf6605224213266b063b9931de..5f9b345abf0526aedb88dc42f9f06fe3328c10ee:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 31d074c..bc481b7 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -36,6 +36,9 @@
 (require 'cl)
 (require 'dot-emacs)
 
+(unless (mdw-emacs-version-p 25)
+  (trap (require 'bracketed-paste) (bracketed-paste-enable)))
+
 ;;;--------------------------------------------------------------------------
 ;;; Some random initialisation.
 
@@ -326,9 +329,12 @@
       ido-default-file-method 'selected-window
       ido-default-buffer-method 'selected-window)
 (setq ido-enable-flex-matching t
+      ido-everywhere t
       ido-confirm-unique-completion t
       ido-use-filename-at-point nil
       ido-auto-merge-work-directories-length -1)
+(setq pcomplete-cycle-completions nil	;Who thought that was a good idea?
+      eshell-cmpl-cycle-completions nil)
 (setq dired-deletion-confirmer		;Make deletion easier in dired
       (symbol-function 'y-or-n-p)
       dired-listing-switches "-alF"	;Do `ls -F' things in dired windows
@@ -338,11 +344,13 @@
 (setq scroll-step 5)			;Don't scroll too much at a time
 (setq blink-cursor-blinks 0)		;Keep blinking the cursor
 (setq-default fill-column mdw-text-width) ;I use rather narrow windows
+(setq reb-re-syntax 'string)		;Enough backslashes even with this
 (setq-default comment-column 40)	;Set a standard comment column
 (setq-default truncate-partial-width-windows nil
 	      truncate-lines t)
 (setq default-indicate-empty-lines t)
 (setq view-read-only t)
+(setq-default view-exit-action #'kill-buffer)
 (setq whitespace-style '(trailing empty indentation face lines-tail
 			 space-before-tab space-after-tab)
       whitespace-line-column mdw-text-width)
@@ -417,7 +425,7 @@
 (setq url-cookie-untrusted-urls '("."))
 
 (setq browse-url-browser-function (mdw-good-url-browser)
-      browse-url-generic-program "mdw-chrome"
+      browse-url-generic-program "chromium"
       browse-url-mozilla-program "mdw-iceweasel")
 
 (setq w3m-default-display-inline-images t
@@ -583,7 +591,8 @@
 	(w32 (font . "fixed613 10")
 	     (background-color . "black")
 	     (foreground-color . "white"))
-	(nil (menu-bar-lines . 0))))
+	(nil (menu-bar-lines . 0)
+	     (background-color . nil))))
 (let ((backg (frame-parameter nil 'background-color)))
   (if (and backg window-system)
       (push (cons 'background-color backg) default-frame-alist)))
@@ -795,7 +804,7 @@
 	TeXinfo-mode-hook tex-mode-hook latex-mode-hook
 	texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
 	lisp-mode-hook lisp-interaction-mode-hook makefile-mode-hook
-	inferior-lisp-mode-hook slime-repl-mode-hook
+	inferior-lisp-mode-hook slime-repl-mode-hook ielm-mode-hook
 	sml-mode-hook haskell-mode-hook erlang-mode-hook
 	smalltalk-mode-hook rexx-mode-hook lua-mode-hook
 	arm-assembler-mode-hook))
@@ -942,6 +951,7 @@
   (add-hook 'lisp-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'inferior-lisp-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'lisp-interaction-mode-hook 'mdw-fontify-lispy t)
+  (add-hook 'ielm-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'slime-repl-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'lisp-mode-hook 'mdw-common-lisp-indent t)
   (add-hook 'inferior-lisp-mode-hook
@@ -977,7 +987,7 @@
 	("^html?$" "." "sensible-browser %o")))
 
 (setq TeX-view-program-list
-      '(("mupdf" "mupdf %o" (mode-io-correlate " %(outpage)"))))
+      '(("mupdf" ("mupdf %o" (mode-io-correlate " %(outpage)")))))
 
 (setq TeX-view-program-selection
       '(((output-dvi style-pstricks) "dvips and gv")