X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/956286a32c692c0d42db6b2dbcfc00d645823327..2cbc27f5c7514c1043f9ea52292178a884c6616d:/dot/emacs diff --git a/dot/emacs b/dot/emacs index 6cd38f3..ac44ce2 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. @@ -71,7 +74,8 @@ (not (memq 'git vc-handled-backends)) (setq vc-handled-backends (cons 'GIT vc-handled-backends))) -(setq magit-log-cutoff-length 512) +(setq magit-log-cutoff-length 512 + magit-log-section-arguments '("-n256" "--decorate" "--graph")) (defun mdw-magit-try-load-config-extensions () (trap (magit-load-config-extensions))) (add-hook 'magit-mode-hook 'mdw-magit-try-load-config-extensions) @@ -163,13 +167,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) @@ -334,6 +338,7 @@ eshell-cmpl-cycle-completions nil) (setq dired-deletion-confirmer ;Make deletion easier in dired (symbol-function 'y-or-n-p) + delete-by-moving-to-trash t dired-listing-switches "-alF" ;Do `ls -F' things in dired windows wdired-allow-to-change-permissions 'advanced) (setq read-quoted-char-radix 16) ;C-q HEX-STUFF [RET] @@ -341,6 +346,7 @@ (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 adaptive-fill-mode nil) ;I have my own machinery instead (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 @@ -348,6 +354,8 @@ (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) @@ -422,7 +430,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 @@ -588,7 +596,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))) @@ -621,55 +630,60 @@ (require 'smex) (smex-initialize) (global-set-key [?\M-x] 'smex)) (progn - (global-set-key [?\C-c ?\M-x] 'execute-extended-command) (global-set-key [?\e ?\e] 'mdw-wrong) (global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit) - (global-set-key [?\C-c ?w left] 'windmove-left) - (global-set-key [?\C-c ?w ?h] 'windmove-left) - (global-set-key [?\C-c ?w up] 'windmove-up) - (global-set-key [?\C-c ?w ?k] 'windmove-up) - (global-set-key [?\C-c ?w down] 'windmove-down) - (global-set-key [?\C-c ?w ?j] 'windmove-down) - (global-set-key [?\C-c ?w right] 'windmove-right) - (global-set-key [?\C-c ?w ?l] 'windmove-right) - (global-set-key [?\C-c ?g ?l] 'org-store-link) + (global-set-key [?\C-c ?\M-x] 'execute-extended-command) + (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point) + (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point) (global-set-key [?\C-c ?g ?a] 'org-agenda) (global-set-key [?\C-c ?g ?b] 'org-iswitchb) - (global-set-key [?\C-c ?t ?i] 'timeclock-in) - (global-set-key [?\C-c ?t ?c] 'timeclock-change) - (global-set-key [?\C-c ?t ?o] 'timeclock-out) - (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 ?g ?l] 'org-store-link) + (global-set-key [?\C-c ?k] 'mdw-compile) + (global-set-key [?\C-c ?m ?4 ?f] 'magit-find-file-other-window) + (global-set-key [?\C-c ?m ?b] 'magit-blame) (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 ?f] 'magit-find-file) + (global-set-key [?\C-c ?m ?m] 'magit-status) (global-set-key [?\C-c ?m ?r] 'magit-list-repositories) - (global-set-key [?\C-c ?m ?b] 'magit-blame) - (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause) + (global-set-key [?\C-c ?m ?w] 'magit-wip-log) (global-set-key [?\C-c ?p ?s] 'mdw-mpc-stop) (global-set-key [?\C-c ?p ?<] 'mdw-mpc-prev) (global-set-key [?\C-c ?p ?>] 'mdw-mpc-next) (global-set-key [?\C-c ?p ?+] 'mdw-mpc-louder) (global-set-key [?\C-c ?p ?-] 'mdw-mpc-quieter) (global-set-key [?\C-c ?p ??] 'mdw-mpc-now-playing) - (global-set-key [?\C-c ?t ?t] 'gtags-find-tag-from-here) - (global-set-key [?\C-c ?t ?.] 'gtags-find-tag) - (global-set-key [?\C-c ?t ?r] 'gtags-find-rtag) + (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause) (global-set-key [?\C-c ?t ?4 ?.] 'gtags-find-tag-other-window) + (global-set-key [?\C-c ?t ?.] 'gtags-find-tag) + (global-set-key [?\C-c ?t ?R] 'timeclock-reread-log) (global-set-key [?\C-c ?t ?,] 'gtags-pop-stack) - (global-set-key [?\C-c ?k] 'mdw-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) + (global-set-key [?\C-c ?t ?c] 'timeclock-change) + (global-set-key [?\C-c ?t ?i] 'timeclock-in) + (global-set-key [?\C-c ?t ?o] 'timeclock-out) + (global-set-key [?\C-c ?t ?r] 'gtags-find-rtag) + (global-set-key [?\C-c ?t ?s] 'timeclock-status-string) + (global-set-key [?\C-c ?t ?t] 'gtags-find-tag-from-here) + (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string) (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window) - (global-set-key [insertchar] 'overwrite-mode) + (global-set-key [?\C-c ?w ?h] 'windmove-left) + (global-set-key [?\C-c ?w ?j] 'windmove-down) + (global-set-key [?\C-c ?w ?k] 'windmove-up) + (global-set-key [?\C-c ?w ?l] 'windmove-right) + (global-set-key [?\C-c ?w ?w] 'mdw-set-frame-width) + (global-set-key [?\C-c ?w up] 'windmove-up) + (global-set-key [?\C-c ?w down] 'windmove-down) + (global-set-key [?\C-c ?w left] 'windmove-left) + (global-set-key [?\C-c ?w right] 'windmove-right) + (global-set-key [?\C-h ?\C-m] 'manual-entry) (global-set-key [?\C-x ?\C-n] 'skel-create-file) (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window) (global-set-key [?\C-x ?5 ?n] 'skel-create-file-other-frame) - (global-set-key [delete] 'delete-char) + (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally) + (global-set-key [?\C-x ?/] 'auto-fill-mode) + (global-set-key [?\M-#] 'calc-dispatch) (global-set-key [?\M-q] 'mdw-fill-paragraph) - (global-set-key [?\C-h ?\C-m] 'manual-entry) + (global-set-key [delete] 'delete-char) + (global-set-key [insertchar] 'overwrite-mode) (global-set-key [C-M-backspace] 'backward-kill-sexp) (global-set-key [mode-line C-mouse-1] 'mouse-tear-off-window) (global-set-key [vertical-scroll-bar C-down-mouse-1] @@ -678,8 +692,6 @@ #'(lambda () (interactive))) (global-set-key [M-S-mouse-3] 'imenu) (global-set-key [XF86WakeUp] "") - (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point) - (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))) @@ -800,8 +812,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-emacs-lisp-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)) @@ -948,7 +959,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 'inferior-emacs-lisp-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 @@ -984,7 +995,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")