X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/0d4e1152a1c56dfa50bf2a581db83868ea7d6ff9..c2c256b7c6b49be7c2084ba6028539f3f8640684:/dot/emacs diff --git a/dot/emacs b/dot/emacs index 37e742d..e269086 100644 --- a/dot/emacs +++ b/dot/emacs @@ -21,9 +21,20 @@ ;;; along with this program; if not, write to the Free Software ;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -(setq load-path (nconc load-path (list "~/lib/emacs"))) -(require 'dot-emacs) +(let ((path "~/lib/emacs/") + (pkgs (list "bbdb/" "multiple-cursors/" "rust-mode/")) + pkg) + (setq load-path (nconc load-path (list path))) + (while (setq pkg (pop pkgs)) + (let ((dir (concat path pkg))) + (if (file-exists-p dir) + (setq load-path (nconc load-path (list dir)))))) + (let ((boot (concat path "mdw-pkgs.el"))) + (if (file-exists-p boot) + (load boot)))) + (require 'cl) +(require 'dot-emacs) ;;;-------------------------------------------------------------------------- ;;; Some random initialisation. @@ -41,6 +52,7 @@ (maybe-autoload 'stgit "stgit" nil t) (maybe-autoload 'nc-timesheet-prepare "nc-timesheet" nil t nil) (maybe-autoload 'nc-timesheet-submit "nc-timesheet" nil t nil) +(maybe-autoload 'org-bbdb-anniversaries "org" nil t) (and (library-exists-p "debian-changelog-mode") (add-to-list 'auto-mode-alist @@ -85,17 +97,18 @@ (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. -(setq load-path (nconc load-path (list "~/lib/emacs/multiple-cursors/"))) (global-set-key [?\C-c ?r] 'mdw-multiple-cursors-keymap) (autoload 'mdw-multiple-cursors-keymap "mdw-multiple-cursors.el" "A keymap for Magnar Sveen's awesome multiple-cursors." nil 'keymap) ;; Rust mode. -(setq load-path (nconc load-path (list "~/lib/emacs/rust-mode/"))) (autoload 'rust-mode "rust-mode" nil t) (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode)) @@ -112,6 +125,7 @@ ;; Emacs server behaviour. (and (or window-system (mdw-emacs-version-p 23)) + (not mdw-fast-startup) (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$") edit-server-new-frame nil gnuserv-frame t) @@ -123,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) @@ -149,7 +168,9 @@ (setq mail-from-style 'angles mail-signature t mail-yank-prefix "> " - mail-archive-file-name "~/Mail/sent" + mail-archive-file-name nil + message-default-mail-headers "" + message-default-news-headers "" compose-mail-user-agent-warnings nil) (setq rmail-display-summary t) @@ -159,6 +180,8 @@ send-mail-function 'sendmail-send-it mail-interactive t sendmail-error-reporting-interactive '("-odb" "-oee")) +(autoload 'sendmail-send-it "sendmail") +(autoload 'smtpmail-send-it "smtpmail") (setq mail-user-agent 'message-user-agent read-mail-command 'gnus) @@ -185,26 +208,60 @@ (or mdw-fast-startup (trap (bbdb-initialize 'gnus 'sendmail 'message))) -(setq bbdb-file "~/etc/state/bbdb" +(setq bbdb-file "~/etc/brain/bbdb" bbdb-north-american-phone-numbers-p nil - bbdb/news-auto-create-p (lambda () - (string-match "^nnimap\\+" - gnus-newsgroup-name)) + bbdb-dwim-net-address-allow-redundancy t + bbdb-extract-address-components-func 'bbdb-extract-address-components + bbdb/news-auto-create-p + (lambda () + (let ((group gnus-newsgroup-name)) + (and (string-match "^nn\\(imap\\|folder\\)\\+" group) + (not (string-match ":\\(crap\\|spam\\|lists\\|corpus\\)\\." + group))))) bbdb-user-mail-names (concat "^" "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)" "\\([-+][^@]*\\|\\)" "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)" + "\\|" "\\(" "\\(mdw\\|mwooding\\)" + "\\(\\+[^@]*\\)?" + "\\|" "0" "\\(mdw\\|mwooding\\)" "k\\.[^@]*" + "\\)" "@" + "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk" "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com" "\\|" "mwooding@\\(good\\|blackberry\\)\\.com" + "\\|" "mark\\.wooding@trustonic\\.com" "\\)$") bbdb-canonicalize-net-hook (lambda (addr) - (cond ((string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_" - "HTML-[0-9]+-[0-9]+-[0-9]+" - "@\\(nationwide-communications\\.co\\.uk\\)") - addr) - (concat "nationwide@" (match-string 1 addr))) + (cond ((null addr) + nil) + ((or (string-match "^mailer-daemon@" addr) + (string-match "\.invalid$" addr) + (string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_" + "HTML-[0-9]+-[0-9]+-[0-9]+" + "@\\(nationwide-communications\\." + "co\\.uk\\)$") + addr) + (string-match (concat "^[0-9]+@bugs\\." + "\\(" "debian\\.org" + "\\|" "distorted\\.org\\.uk" + "\\)$") + addr) + (string-match (concat "^MicrosoftExchange[0-9a-f]*" + "@newincco\\.onmicrosoft\\.com") + addr) + (member (md5 addr) + '("8815c5583970856799c85a3ee0eb6a9f" ;work wiki spam + "0b94ab4d25dacaa5ac07243a09c9e22e" ;work bug spam + "35fb1633379a1e4d4be3b139cae20111" ;work crucible spam + )) + (and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr) + (string= (md5 (match-string 2 addr)) + "879b795aed959b1a000e9f95c132b16c"))) + nil) + ((string-match "^\\([^@+]+\\)\\+[^@]*\\(@.*\\)$" addr) + (concat (match-string 1 addr) (match-string 2 addr))) (t addr)))) ;; Customization. @@ -222,6 +279,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))) @@ -256,7 +322,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 @@ -264,13 +339,18 @@ (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-default fill-column 77) ;I use rather narrow windows +(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 whitespace-style - '(trailing space-before-tab space-after-tab empty indentation face)) +(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) (setq woman-use-own-frame nil ;Keep man pages somewhere sensible woman-fill-column 72) ;Right margin position. (setq diff-switches "-u" ;I like reading unified diffs @@ -280,6 +360,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) @@ -298,7 +379,10 @@ (setq uniquify-buffer-name-style 'post-forward-angle-brackets) (setq uniquify-after-kill-buffer-p t)) (transient-mark-mode t) -(setq mark-even-if-inactive t) +(setq mark-even-if-inactive t + shift-select-mode nil + delete-active-region nil + delete-selection-mode nil) (trap (tooltip-mode 0) (tool-bar-mode 0)) @@ -345,8 +429,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 @@ -361,7 +445,12 @@ ;;;-------------------------------------------------------------------------- ;;; Calendar configuration. -(setq diary-file "~/etc/state/diary") +(setq diary-file + (let ((main-diary "~/etc/brain/diary") + (index "~/etc/index.diary")) + (if (file-exists-p index) + index + main-diary))) ;; Trivial stuff for the sunrise/sunset calculations. @@ -380,15 +469,19 @@ ;; Date format fiddling. (setq european-calendar-style t - calendar-date-style 'european) - -(setq diary-date-forms '((day "[-/]" month "[^-/0-9]") - (day " *" monthname "[ \t]*\\(\^M\\|\n\\)") - (backup day " *" monthname "\\W+\\<[^*0-9]") - (day "[-/]" month "[-/]" year "[^0-9]") - (day " *" monthname " *" year "[^0-9]") - (year "[-/]" month "[-/]" day "[^0-9]") - (dayname "\\W"))) + calendar-date-style 'european + calendar-time-display-form + '(24-hours ":" minutes + (if time-zone " (") time-zone (if time-zone ")"))) + +(setq diary-date-forms + '((day "[-/]" month "[^-/0-9]") + (day " *" monthname "[ \t]*\\(\^M\\|\n\\)") + (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|[0-9]+[:aApP]\\)") + (day "[-/]" month "[-/]" year "[^0-9]") + (day " *" monthname " *" year "[^0-9]") + (year "[-/]" month "[-/]" day "[^0-9]") + (dayname "\\W"))) ;; Fancy diary handling. @@ -408,22 +501,31 @@ (setq appt-display-interval 3) (setq appt-message-warning-time 10) (and (not mdw-fast-startup) - (trap (appt-activate 1))) + (trap (require 'org) + (require 'bbdb) + (appt-activate 1))) ;; Org-mode agenda. (setq org-agenda-include-diary t - org-tags-column -77) + org-directory "~/etc/brain.local/" + org-default-notes-file (concat org-directory "local.org") + org-tags-column -77 + org-agenda-align-tags-to-column org-tags-column) ;; Cosmetic stuff. -(setq calendar-view-diary-initially-flag t - calendar-view-holidays-initially-flag t) +(setq calendar-view-diary-initially-flag nil + calendar-view-holidays-initially-flag nil + calendar-mark-diary-entries-flag t) (setq display-time-24hr-format t) (display-time) (column-number-mode 1) -(trap (if window-system (calendar))) +(trap + (if (and window-system (not mdw-fast-startup)) + (let ((calendar-view-diary-initially-flag t)) + (calendar)))) ;;;-------------------------------------------------------------------------- ;;; MailCrypt. @@ -460,8 +562,10 @@ ;; Default frame size. -(setq default-frame-alist - `((width . ,(if (>= emacs-major-version 21) 77 78)) +(setq frame-background-mode (if mdw-black-background 'dark 'light) + default-frame-alist + `((width . ,(+ mdw-column-width + (if (>= emacs-major-version 21) 0 1))) (height . 33) (vertical-scroll-bars . right) (cursor-type . bar) @@ -472,9 +576,10 @@ (tool-bar-lines . 0) (menu-bar-lines . 1) (cursor-color . "red") - (background-mode . ,(if mdw-black-background 'dark 'light))) + (background-mode . ,frame-background-mode)) initial-frame-alist - `((width . ,(if (>= emacs-major-version 21) 77 78)) + `((width . ,(+ mdw-column-width + (if (>= emacs-major-version 21) 0 1))) (menu-bar-lines . ,(if window-system 1 0))) window-system-default-frame-alist '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850") @@ -484,6 +589,9 @@ (background-color . "black") (foreground-color . "white")) (nil (menu-bar-lines . 0)))) +(let ((backg (frame-parameter nil 'background-color))) + (if (and backg window-system) + (push (cons 'background-color backg) default-frame-alist))) ;; Other frame fiddling. @@ -494,8 +602,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) @@ -512,13 +638,31 @@ (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) - (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window) + (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window) (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) @@ -538,7 +682,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 @@ -548,6 +699,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))) @@ -556,7 +709,7 @@ (or mdw-fast-startup (trap (progn (org-remember-insinuate) - (global-set-key [?\C-c ?o ?r] 'org-remember)))) + (global-set-key [?\C-c ?g ?r] 'org-remember)))) ;; Minor mode listing @@ -598,7 +751,6 @@ "\\)$") . text-mode) ("\\.calc?$" . apcalc-mode) - ("/src/linux/.*\\.\\(c\\|h\\|cc\\)$" . linux-c-mode) ("/\\(s\\|sh\\)/" . arm-assembler-mode) ("\\.\\(cmd\\|exec\\|rexx\\)$" . rexx-mode) ("\\.st$" . smalltalk-mode) @@ -650,7 +802,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) @@ -719,11 +871,11 @@ (add-hook 'c-mode-hook 'mdw-fontify-c-and-c++ t) (add-hook 'objc-mode-hook 'mdw-fontify-c-and-c++ t) (add-hook 'c++-mode-hook 'mdw-fontify-c-and-c++ t) - (add-hook 'linux-c-mode-hook #'(lambda () (setq c-basic-offset 8))) (add-hook 'asm-mode-hook 'mdw-fontify-asm t) (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) @@ -744,6 +896,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"))) @@ -808,9 +961,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") @@ -825,14 +978,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 "\"")