X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/733514e5fdbce89f2e2fe3e72c455911d7d5c8e9..74ec7785958ee08eea45fcc4542de67f7fc0ab0f:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 93e54f8..f7e8ec3 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.
 
@@ -163,13 +166,13 @@
 (setq calc-settings-file "~/.emacs-calc")
 (load calc-settings-file)
 
-;; ---- Some mail and news configuration ---
+;; Some mail and news configuration.
 
 (setq mail-from-style 'angles
       mail-signature t
       mail-yank-prefix "> "
       mail-archive-file-name nil
-      message-default-mail-headers ""
+      message-default-mail-headers "X-Auto-Response-Suppress: DR, RN, NRN, OOF\n"
       message-default-news-headers ""
       compose-mail-user-agent-warnings nil)
 
@@ -279,6 +282,15 @@
     (apply #'set-input-mode
 	   (nconc (list (nth 0 im) (nth 1 im) 0) (nthcdr 3 im)))))
 
+;; Some unpleasant terminal hackery.  Screen prefixes the current terminal
+;; name with `screen.', and Emacs is too dim to split the name at the `.'.
+;; Help it out.
+
+(defun terminal-init-screen.xterm ()
+  (tty-run-terminal-initialization (selected-frame) "screen"))
+(defun terminal-init-screen.putty ()
+  (tty-run-terminal-initialization (selected-frame) "screen"))
+
 ;; Don't disable any commands.
 
 (mapatoms #'(lambda (sym) (put sym 'disabled nil)))
@@ -317,8 +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-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
@@ -326,12 +342,17 @@
 (setq read-quoted-char-radix 16)	;C-q HEX-STUFF [RET]
 (setq case-fold-file-names nil)		;Don't translate file names (grr...)
 (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)
+(and window-system (not mdw-fast-startup)
+     (setq confirm-kill-emacs #'yes-or-no-p))
 (setq whitespace-style '(trailing empty indentation face lines-tail
 			 space-before-tab space-after-tab)
       whitespace-line-column mdw-text-width)
@@ -406,7 +427,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
@@ -572,7 +593,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)))
@@ -647,6 +669,7 @@
   (global-set-key [?\M-#] 'calc-dispatch)
   (global-set-key [?\C-x ?/] 'auto-fill-mode)
   (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window)
+  (global-set-key [?\C-c ?w ?w] 'mdw-set-frame-width)
   (global-set-key [insertchar] 'overwrite-mode)
   (global-set-key [?\C-x ?\C-n] 'skel-create-file)
   (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window)
@@ -784,7 +807,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))
@@ -931,6 +954,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
@@ -966,7 +990,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")