X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/2ed3b3fa7a65031a56b7716a0e5d734559c49b2e..b4fa205ffd184f13511678d7f2e6bcd578411203:/dot/emacs diff --git a/dot/emacs b/dot/emacs index e7e28c3..b726fab 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. @@ -97,6 +100,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 +140,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 +219,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\\)" @@ -270,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))) @@ -304,7 +325,16 @@ (setq next-line-add-newlines nil) ;Don't add weird newlines (setq split-height-threshold nil) ;Reuse windows where sensible (setq display-buffer-reuse-frames nil ;Don't confuse me by showing buffers - iswitchb-default-method 'samewindow) ;in other random frames + iswitchb-default-method 'samewindow ;in other random frames + 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 @@ -312,12 +342,15 @@ (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) (setq whitespace-style '(trailing empty indentation face lines-tail space-before-tab space-after-tab) whitespace-line-column mdw-text-width) @@ -399,8 +432,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 @@ -572,8 +605,26 @@ (trap (windmove-default-keybindings)) (setq windmove-wrap-around t) -(trap (iswitchb-mode)) +(trap (require 'ido) (ido-mode 1) + (require 'ido-ubiquitous) (ido-ubiquitous-mode 1) + (setq ido-cr+-max-items nil + ido-ubiquitous-command-overrides + (append ido-ubiquitous-command-overrides + `((enable-old regexp ,(concat "\\`" + "gtags-find-" + "\\(" "tag" + "\\|file" + "\\|rtag" + "\\|symbol" + "\\)" + "\\(" "\\|-other-window" + "\\)" + "\\'"))))) + (setq magit-completing-read-function 'magit-ido-completing-read) + (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) @@ -590,9 +641,27 @@ (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 ?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 ?m ?b] 'magit-blame) + (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause) + (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 ?t ?4 ?.] 'gtags-find-tag-other-window) + (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) @@ -616,7 +685,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 @@ -626,6 +702,8 @@ (trap (require 'dired-x)) (and (fboundp 'dired-do-relsymlink) (define-key dired-mode-map [?\C-c ?\C-s] 'dired-do-relsymlink)))) +(setq dired-guess-shell-alist-user + '(("\\.pdf\\'" "mupdf"))) (add-hook 'org-mode-hook #'(lambda () (mdw-clobber-evil-keymap org-mode-map))) @@ -725,9 +803,9 @@ 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 + smalltalk-mode-hook rexx-mode-hook lua-mode-hook arm-assembler-mode-hook)) (global-font-lock-mode t) @@ -800,6 +878,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) @@ -820,6 +899,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"))) @@ -870,6 +950,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 @@ -884,9 +965,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") @@ -901,14 +982,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 "\"")