X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/33abafd2b9dc49e965ad6527ba47cdcb3d3814a7..7cd3318bec2f596106ad48f9b5b191b37148aea1:/dot/emacs diff --git a/dot/emacs b/dot/emacs index 35e4f7a..845f1ff 100644 --- a/dot/emacs +++ b/dot/emacs @@ -24,11 +24,12 @@ (setq load-path (nconc load-path (list "~/lib/emacs"))) (require 'dot-emacs) -;;;----- Some random initialisation ----------------------------------------- +;;;-------------------------------------------------------------------------- +;;; Some random initialisation. (setq mdw-init-window (selected-window)) -;; --- Load some other bits of code --- +;; Load some other bits of code. (maybe-autoload 'cc-mode "cc-mode" nil t) (maybe-autoload 'rexx-mode "rexx-mode" nil t) @@ -63,17 +64,17 @@ (trap (or mdw-fast-startup (semantic-load-enable-minimum-features))) (setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/") -;; --- Skeleton stuff --- +;; Skeleton stuff. (trap (or mdw-fast-startup (require 'skel-init))) -;; --- Window system-dependent things --- +;; Window system-dependent things. (require 'paren) (trap (show-paren-mode t)) (or window-system (menu-bar-mode -1)) -;; --- Temporary directory handling --- +;; Temporary directory handling. (defun mdw-check-dir-exists (dir) (and dir @@ -83,13 +84,14 @@ (mdw-check-dir-exists (format "/tmp/%s" (user-login-name))) "/tmp")) -;; --- Emacs server behaviour --- +;; Emacs server behaviour. -(and window-system - (trap (gnuserv-start) - (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")))) +(and (or window-system (>= emacs-major-version 23)) + (trap (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")) + (start-server) + (gnuserv-start))) -;; --- Control backup behaviour --- +;; Control backup behaviour. (setq backup-by-copying nil) (setq backup-by-copying-when-linked t) @@ -99,12 +101,12 @@ '("/\\.git/COMMIT_EDITMSG$" "/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$")) -;; --- Safe variables --- +;; Safe variables. (setq safe-local-variable-values '((make-backup-files . nil))) -;; --- Calculator fiddling --- +;; Calculator fiddling. (setq calc-settings-file "~/.emacs-calc") (load calc-settings-file) @@ -143,14 +145,14 @@ (trap (bbdb-initialize 'gnus 'sendmail 'message))) (setq bbdb-north-american-phone-numbers-p nil) -;; --- Customization --- +;; Customization. (setq custom-file "~/.emacs-custom") (trap (load custom-file)) (trap (load "~/.emacs-local")) -;; --- Internationalization twiddling --- +;; Internationalization twiddling. (trap ;; Have top-bit-set characters work properly in terminals. @@ -158,15 +160,15 @@ (apply #'set-input-mode (nconc (list (nth 0 im) (nth 1 im) 0) (nthcdr 3 im))))) -;; --- Don't disable any commands --- +;; Don't disable any commands. (mapatoms #'(lambda (sym) (put sym 'disabled nil))) -;; --- Split a wide window --- +;; Split a wide window. (mdw-divvy-window) -;; --- Postscript printing --- +;; Postscript printing. (setq ps-paper-type 'a4 ps-print-color-p nil @@ -175,13 +177,13 @@ ps-font-family 'Courier ps-font-size 6.5) -;; --- Splash screen stuff --- +;; Splash screen stuff. (or window-system (setq inhibit-splash-screen t inhibit-startup-message t)) -;; --- Other goodies --- +;; Other goodies. (trap (resize-minibuffer-mode 1)) ;Make minibuffer grow dynamically (auto-compression-mode 1) ;Enable automatic compression @@ -238,7 +240,8 @@ (setq cltl2-root-url (mdw-config 'cltl-url)) (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url)) -;;;----- W3 and URL fetching stuff ------------------------------------------ +;;;-------------------------------------------------------------------------- +;;; W3 and URL fetching stuff. (let ((proxy (mdw-config 'http-proxy))) (setq url-proxy-services @@ -258,17 +261,18 @@ w3-display-inline-image t w3-keybinding 'info) -;;;----- Calendar configuration --------------------------------------------- +;;;-------------------------------------------------------------------------- +;;; Calendar configuration. (setq diary-file "~/etc/diary") -;; --- Trivial stuff for the sunrise/sunset calculations --- +;; Trivial stuff for the sunrise/sunset calculations. (setq calendar-latitude 52.2) (setq calendar-longitude 0.1) (setq calendar-location-name "Cambridge, UK") -;; --- Holidays --- +;; Holidays. (and (not mdw-fast-startup) (trap @@ -276,7 +280,7 @@ (setq other-holidays (append english-and-welsh-bank-holidays other-holidays)))) -;; --- Date format fiddling --- +;; Date format fiddling. (setq european-calendar-style t) @@ -288,7 +292,7 @@ (year "[-/]" month "[-/]" day "[^0-9]") (dayname "\\W"))) -;; --- Fancy diary handling --- +;; Fancy diary handling. (add-hook 'diary-display-hook 'fancy-diary-display) (setq diary-list-include-blanks t) @@ -296,19 +300,19 @@ (add-hook 'list-diary-entries-hook 'include-other-diary-files) (add-hook 'mark-diary-entries-hook 'mark-included-diary-files) -;; --- Appointment management --- +;; Appointment management. (add-hook 'diary-hook 'appt-make-list) (setq appt-issue-message t) (setq appt-display-interval 3) (setq appt-message-warning-time 10) -;; --- Org-mode agenda --- +;; Org-mode agenda. (setq org-agenda-include-diary t org-tags-column -77) -;; --- Cosmetic stuff --- +;; Cosmetic stuff. (setq display-time-24hr-format t) (display-time) @@ -317,15 +321,16 @@ (let ((view-diary-entries-initially t)) (calendar)))) -;;;----- MailCrypt ---------------------------------------------------------- +;;;-------------------------------------------------------------------------- +;;; MailCrypt. -;; --- Define more mode hooks for MailCrypt --- +;; Define more mode hooks for MailCrypt. (setq mdw-mc-modes '((mdwmail-mode (encrypt . mdwmail-mc-encrypt) (sign . mdwmail-mc-sign)))) -;; --- Load the MailCrypt support --- +;; Load the MailCrypt support. (trap (and (string-match "linux" (symbol-name system-type)) @@ -346,22 +351,22 @@ (define-key mc-write-mode-map "\C-c/E" 'mc-encrypt-region) (add-hook 'text-mode-hook 'mc-install-write-mode)))) -;;;----- Other common declarations ------------------------------------------ +;;;-------------------------------------------------------------------------- +;;; Other common declarations. -;; --- Default frame size --- +;; Default frame size. (setq default-frame-alist (mdw-uniquify-alist '((width . 78) (height . 33) - (vertical-scroll-bars . right)) - (and window-system - '((cursor-type . bar) - (cursor-blink . t) - (left-fringe . 5) - (right-fringe . 5) - (scroll-bar-width . 15))) - '((cursor-color . "red")) + (vertical-scroll-bars . right) + (cursor-type . bar) + (cursor-blink . t) + (left-fringe . 5) + (right-fringe . 5) + (scroll-bar-width . 15) + (cursor-color . "red")) (if mdw-black-background '((background-color . "black") (foreground-color . "white") @@ -374,11 +379,11 @@ '((transparency . t)) default-frame-alist)) -;; --- Other frame fiddling --- +;; Other frame fiddling. (setq frame-title-format '("" invocation-name "@" system-name ": %b")) -;; --- Global keymap changes --- +;; Global keymap changes. (trap (windmove-default-keybindings)) @@ -423,12 +428,17 @@ (and (not mdw-fast-startup) (fboundp 'hippie-expand) (global-set-key [?\M-/] 'hippie-expand)) +(eval-after-load "dired" + '(progn + (define-key dired-mode-map [?\C-x ?\C-q] + 'wdired-change-to-wdired-mode))) + (add-hook 'org-mode-hook #'(lambda () (mdw-clobber-evil-keymap org-mode-map))) (add-hook 'org-agenda-mode-hook #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map))) -;; --- Recognising types of files --- +;; Recognising types of files. (setq auto-mode-alist (append `(("\\.p[lm]$" . perl-mode) @@ -472,14 +482,15 @@ (setq completion-ignored-extensions (append `(".hc" ".hi") completion-ignored-extensions)) -;; --- Some common local definitions --- +;; Some common local definitions. (make-variable-buffer-local 'mdw-auto-indent) (mapcar (lambda (hook) (add-hook hook 'mdw-misc-mode-config)) '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook csharp-mode-hook perl-mode-hook cperl-mode-hook - python-mode-hook icon-mode-hook awk-mode-hook tcl-mode-hook + python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook + tcl-mode-hook asm-mode-hook TeX-mode-hook LaTeX-mode-hook TeXinfo-mode-hook tex-mode-hook latex-mode-hook texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook @@ -492,7 +503,8 @@ (global-font-lock-mode t) (defalias 'perl-mode 'cperl-mode) -;;;----- Rootly editingness ------------------------------------------------- +;;;-------------------------------------------------------------------------- +;;; Rootly editingness. (eval-after-load "tramp" '(progn @@ -528,9 +540,10 @@ ((executable-find "really") "really") (t "su"))))))) -;;;----- General fontification ---------------------------------------------- +;;;-------------------------------------------------------------------------- +;;; General fontification. -;; --- Configure lazy fontification --- +;; Configure lazy fontification. (and (fboundp 'lazy-lock-mode) (setq font-lock-support-mode 'lazy-lock-mode)) @@ -542,9 +555,6 @@ (setq lazy-lock-stealth-lines 100) (setq lazy-lock-stealth-verbose t) -(add-hook 'after-make-frame-functions 'mdw-do-set-font) -(add-hook 'term-setup-hook (lambda () (mdw-do-set-font (selected-frame)))) -(add-hook 'window-setup-hook (lambda () (mdw-do-set-font (selected-frame)))) (add-hook 'c-mode-hook 'mdw-fontify-c-and-c++ t) (add-hook 'objc-mode-hook 'mdw-fontify-c-and-c++ t) @@ -567,6 +577,7 @@ (setq-default py-indent-offset 2) (add-hook 'python-mode-hook 'mdw-fontify-python t) +(add-hook 'pyrex-mode-hook 'mdw-fontify-pyrex t) (setq py-python-command-args `("-i" "-colors" ,(if mdw-black-background "Linux" "LightBG"))) @@ -617,7 +628,8 @@ (add-hook 'text-mode-hook 'mdw-text-mode t) -;;;----- TeX stuff ---------------------------------------------------------- +;;;-------------------------------------------------------------------------- +;;; TeX stuff. (setq TeX-output-view-style '(("^dvi$" @@ -642,6 +654,9 @@ ("^pdf$" "." "evince %o") ("^html?$" "." "netscape %o"))) +(setq TeX-open-quote "\"" + TeX-close-quote "\"") + (setq reftex-use-external-file-finders t reftex-auto-recenter-toc t) @@ -666,7 +681,8 @@ unify-case) bibtex-include-OPTkey nil) -;;;----- SLIME setup -------------------------------------------------------- +;;;-------------------------------------------------------------------------- +;;; SLIME setup. (trap (if (not mdw-fast-startup) @@ -689,7 +705,8 @@ (cons head slime-lisp-implementations)))))) (setq slime-default-lisp 'sbcl) -;;;----- Blogging ----------------------------------------------------------- +;;;-------------------------------------------------------------------------- +;;; Blogging. (setq weblogger-config-alist '(("vox" @@ -697,16 +714,17 @@ ("server-url" . "http://vox.distorted.org.uk/admin/mt-xmlrpc.cgi") ("weblog" . "1")))) -;;;----- Shell mode --------------------------------------------------------- +;;;-------------------------------------------------------------------------- +;;; Shell mode. -;; --- Make the shell mode aware of my prompt --- +;; Make the shell mode aware of my prompt. (setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *") (setq comint-password-prompt-regexp (concat "\\(\\([Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)" "[Pp]assword\\|pass phrase\\):\\s *\\'")) -;; --- Notice passwords, and make C-a work right --- +;; Notice passwords, and make C-a work right. (add-hook 'shell-mode-hook #'mdw-sh-mode-setup) (add-hook 'shell-mode-hook #'ansi-color-for-comint-mode-on) @@ -714,7 +732,8 @@ (add-hook 'term-mode-hook #'mdw-term-mode-setup) -;;;----- Finishing touches -------------------------------------------------- +;;;-------------------------------------------------------------------------- +;;; Finishing touches. (trap (select-window mdw-init-window)) (provide 'emacs-init)