X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/20d4403c89c23b412c09d9f2b360cb4dc35f1991..c3ee39abd770ddfa04264cd4393eb1bbf8aa4c2b:/emacs diff --git a/emacs b/emacs index 48e82fe..d1fb141 100644 --- a/emacs +++ b/emacs @@ -140,6 +140,8 @@ (setq dabbrev-case-replace nil) ;Retain case when completing (setq next-line-add-newlines nil) ;Don't add weird newlines (setq split-height-threshold 45) ;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 (setq dired-deletion-confirmer ;Make deletion easier in dired (symbol-function 'y-or-n-p)) (setq dired-listing-switches "-alF") ;Do `ls -F' things in dired windows @@ -158,6 +160,7 @@ '("-print0 | xargs -0r ls -ld" . "ld")) (setq bookmark-save-flag 0) ;Save bookmarks automatically (setq Info-fontify-maximum-menu-size 60000) +(setq set-mark-command-repeat-pop t) (setq ispell-program-name "aspell" ispell-local-dictionary "en_GB-ize-w_accents" flyspell-default-dictionary "en_GB-ize-w_accents" @@ -173,6 +176,10 @@ (trap (or mdw-fast-startup (global-auto-revert-mode t))) (setq psgml-html-build-new-buffer nil) +(defvar mdw-black-background t) + +(eval-after-load "outline" '(require 'foldout)) + (setq cltl2-root-url (mdw-config 'cltl-url)) (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url)) @@ -198,12 +205,22 @@ ;;;----- Calendar configuration --------------------------------------------- +(setq diary-file "~/etc/diary") + ;; --- Trivial stuff for the sunrise/sunset calculations --- (setq calendar-latitude 52.2) (setq calendar-longitude 0.1) (setq calendar-location-name "Cambridge, UK") +;; --- Holidays --- + +(and (not mdw-fast-startup) + (trap + (require 'ew-hols) + (setq other-holidays (append english-and-welsh-bank-holidays + other-holidays)))) + ;; --- Date format fiddling --- (setq european-calendar-style t) @@ -240,7 +257,7 @@ (let ((view-diary-entries-initially t)) (calendar)))) -(defvar mdw-black-background t) +;;;----- MailCrypt ---------------------------------------------------------- ;; --- Define more mode hooks for MailCrypt --- @@ -304,32 +321,42 @@ ;; --- Global keymap changes --- (trap - (windmove-default-keybindings) - (setq windmove-wrap-around t)) + (windmove-default-keybindings)) +(setq windmove-wrap-around t) (trap (iswitchb-mode)) -(global-set-key "\M-#" 'calc-dispatch) -(global-set-key [f4] 'query-replace-regexp) -(global-set-key [f5] 'goto-line) -(global-set-key [f6] 'auto-fill-mode) -(global-set-key [f7] 'occur) -(global-set-key [f8] 'undo) -(global-set-key [f9] 'mdw-divvy-window) +(global-set-key [?\C-x ?w left] 'windmove-left) +(global-set-key [?\C-x ?w ?h] 'windmove-left) +(global-set-key [?\C-x ?w up] 'windmove-up) +(global-set-key [?\C-x ?w ?k] 'windmove-up) +(global-set-key [?\C-x ?w down] 'windmove-down) +(global-set-key [?\C-x ?w ?j] 'windmove-down) +(global-set-key [?\C-x ?w right] 'windmove-right) +(global-set-key [?\C-x ?w ?l] 'windmove-right) +(global-set-key [?\C-x ?g ?l] 'org-store-link) +(global-set-key [?\C-x ?g ?a] 'org-agenda) +(global-set-key [?\C-x ?t ?i] 'timeclock-in) +(global-set-key [?\C-x ?t ?c] 'timeclock-change) +(global-set-key [?\C-x ?t ?o] 'timeclock-out) +(global-set-key [?\C-x ?t ?r] 'timeclock-reread-log) +(global-set-key [?\C-x ?t ?w] 'timeclock-workday-remaining-string) +(global-set-key [?\C-x ?t ?s] 'timeclock-status-string) +(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 [insertchar] 'overwrite-mode) -(global-set-key "\C-xm" 'vm-mail) -(global-set-key "\C-x\C-n" 'skel-create-file) -(global-set-key "\C-x4n" 'skel-create-file-other-window) -(global-set-key "\C-x5n" 'skel-create-file-other-frame) +(global-set-key [?\C-x ?m] 'vm-mail) +(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-[\C-m" 'call-last-kbd-macro) -(global-set-key "\M-q" 'mdw-fill-paragraph) -(global-set-key "\C-h\C-m" 'manual-entry) +(global-set-key [?\M-q] 'mdw-fill-paragraph) +(global-set-key [?\C-h ?\C-m] 'manual-entry) +(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] 'mouse-drag-vertical-line) (global-set-key [vertical-scroll-bar C-mouse-1] #'(lambda () (interactive))) -(global-set-key [mouse-4] 'mdw-wheel-up) -(global-set-key [mouse-5] 'mdw-wheel-down) ;; --- Recognising types of files --- @@ -338,6 +365,7 @@ ("\\.m$" . objc-mode) ("\\.mxd$" . c-mode) ("\\.cs" . csharp-mode) + ("\\.org$" . org-mode) ;; ("/[ch]/" . c-mode) (,(concat "/\\(" "\\.stgit\\.msg" "\\|" @@ -508,11 +536,6 @@ (add-hook 'lisp-interaction-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) -(trap - (if (not mdw-fast-startup) - (progn - (require 'slime-autoloads) - (slime-setup '(slime-autodoc))))) (add-hook 'inferior-lisp-mode-hook #'(lambda () (local-set-key "\C-m" 'comint-send-and-indent)) t) @@ -546,6 +569,12 @@ ;;;----- SLIME setup -------------------------------------------------------- +(trap + (if (not mdw-fast-startup) + (progn + (require 'slime-autoloads) + (slime-setup '(slime-autodoc slime-c-p-c))))) + (let ((stuff '((cmucl ("cmucl")) (sbcl ("sbcl") :coding-system utf-8-unix) (clisp ("clisp") :coding-system utf-8-unix))))