X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/be325acf70bdbded6d86aa491720d39657fd2e73..0f2aab7bf3c99841ef3090480a0cbde310782a30:/dot/emacs diff --git a/dot/emacs b/dot/emacs index 5aa8918..1a69858 100644 --- a/dot/emacs +++ b/dot/emacs @@ -23,6 +23,7 @@ (setq load-path (nconc load-path (list "~/lib/emacs"))) (require 'dot-emacs) +(require 'cl) ;;;-------------------------------------------------------------------------- ;;; Some random initialisation. @@ -58,6 +59,8 @@ (not (memq 'git vc-handled-backends)) (setq vc-handled-backends (cons 'GIT vc-handled-backends))) +(setq magit-log-cutoff-length 512) + (trap (or mdw-fast-startup (require 'p4))) (trap (or mdw-fast-startup (require 'tex-site))) @@ -126,10 +129,11 @@ ;; ---- Some mail and news configuration --- -(setq mail-from-style 'parens) -(setq mail-signature t) -(setq mail-yank-prefix "> ") -(setq mail-archive-file-name "~/Mail/sent") +(setq mail-from-style 'angles + mail-signature t + mail-yank-prefix "> " + mail-archive-file-name "~/Mail/sent" + compose-mail-user-agent-warnings nil) (setq rmail-display-summary t) (setq rmail-file-name "~/Mail/rmail") @@ -141,6 +145,8 @@ (setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$" message-yank-prefix "> " message-yank-cited-prefix "> " + message-send-mail-function 'message-send-mail-with-sendmail + message-sendmail-envelope-from 'header message-indent-citation-function '(message-indent-citation mdw-trim-spaces-after-citing)) @@ -218,10 +224,11 @@ (setq scroll-step 5) ;Don't scroll too much at a time (setq-default fill-column 77) ;I use rather narrow windows (setq-default comment-column 40) ;Set a standard comment column -(setq-default truncate-partial-width-windows nil) +(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)) + '(trailing space-before-tab space-after-tab empty indentation face)) (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 @@ -240,6 +247,9 @@ (setq ispell-program-name "aspell-hack" ispell-local-dictionary "en_GB-ize-w_accents" flyspell-default-dictionary "en_GB-ize-w_accents" + ispell-local-dictionary-alist + '(("en_GB-ize-w_accents" "[[:alpha:]]" "[^[:alpha:]]" "'" t + ("-d" "en_GB-ize-w_accents") nil utf-8)) ispell-silently-savep t) (trap (require 'uniquify) @@ -261,6 +271,10 @@ (define-key outline-mode-prefix-map [?\C-r] 'reveal-mode) (define-key outline-mode-prefix-map [?\C--] 'mdw-outline-collapse-all))) +(setq imenu-auto-rescan t + imenu-auto-rescan-maxout (* 128 1024) + imenu-max-items 60) + (setq cltl2-root-url (mdw-config 'cltl-url)) (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url)) @@ -353,10 +367,7 @@ (setq display-time-24hr-format t) (display-time) (column-number-mode 1) -(trap - (if window-system - (let ((view-diary-entries-initially t)) - (calendar)))) +(trap (if window-system (calendar))) ;;;-------------------------------------------------------------------------- ;;; MailCrypt. @@ -460,6 +471,7 @@ 'mouse-drag-vertical-line) (global-set-key [vertical-scroll-bar C-mouse-1] #'(lambda () (interactive))) + (global-set-key [M-S-mouse-3] 'imenu) (global-set-key [XF86WakeUp] "") (and (not mdw-fast-startup) (fboundp 'hippie-expand) (global-set-key [?\M-/] 'hippie-expand))) @@ -477,9 +489,9 @@ (add-hook 'org-agenda-mode-hook #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map))) (or mdw-fast-startup - (progn - (org-remember-insinuate) - (global-set-key [?\C-c ?r] 'org-remember))) + (trap (progn + (org-remember-insinuate) + (global-set-key [?\C-c ?r] 'org-remember)))) ;; Minor mode listing @@ -505,6 +517,7 @@ ;; ("/[ch]/" . c-mode) (,(concat "/\\(" "\\.stgit\\.msg" "\\|" + "\\.topmsg" "\\|" "\\.git/COMMIT_EDITMSG" "\\|" "svn-commit\\.tmp" "\\|" "svk-commit[^/.]*\\.tmp" @@ -532,7 +545,12 @@ auto-mode-alist)) (setq interpreter-mode-alist - (append `(("runlisp" . lisp-mode)) + (append `(("runlisp" . lisp-mode) + ("@BASH" . sh-mode) + ("@PYTHON@" . python-mode) + ("@PERL@" . perl-mode) + ("@TCLSH@" . tcl-mode) + ("@WISH@" . tcl-mode)) interpreter-mode-alist)) (setq completion-ignored-extensions @@ -549,19 +567,20 @@ (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 pyrec-mode-hook icon-mode-hook awk-mode-hook - tcl-mode-hook go-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 - lisp-mode-hook lisp-interaction-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 - arm-assembler-mode-hook)) +(mapc (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 pyrec-mode-hook icon-mode-hook awk-mode-hook + tcl-mode-hook go-mode-hook js-mode-hook conf-mode-hook + m4-mode-hook autoconf-mode-hook autotest-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 + 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 + arm-assembler-mode-hook)) (global-font-lock-mode t) (defalias 'perl-mode 'cperl-mode) @@ -595,11 +614,21 @@ (tramp-remote-sh "/bin/sh")) ,@tramp-methods))) (setq tramp-default-method "ssh") - (setq tramp-default-method-alist - `(("\\`\\(localhost\\|\\)\\'" "" - ,(cond ((executable-find "become") "become") - ((executable-find "really") "really") - (t "su"))))))) + (let ((rootlyness (cond ((executable-find "really") "really") + ((executable-find "become") "become") + ((executable-find "sudo") "sudo") + (t "su"))) + (this-host (concat "\\`\\(localhost\\|" + (system-name) "\\|\\)\\'")) + (this-user (concat "\\`\\(" (user-login-name) "\\|" + (user-real-login-name) "\\|\\)\\'"))) + (setq tramp-default-method-alist + `((,this-host nil ,rootlyness) + (nil ,this-user "ssh") + (nil "." ,rootlyness))) + (setq tramp-default-proxies-alist + `((,this-host nil nil) + (nil "." "/ssh:%h:")))))) ;;;-------------------------------------------------------------------------- ;;; General fontification. @@ -630,6 +659,7 @@ (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t) (add-hook 'java-mode-hook 'mdw-fontify-java t) + (add-hook 'js-mode-hook 'mdw-fontify-javascript t) (add-hook 'csharp-mode-hook 'mdw-fontify-csharp t) (add-hook 'awk-mode-hook 'mdw-fontify-awk t) @@ -639,6 +669,7 @@ (progn (setq-default py-indent-offset 2 + python-indent 2 py-python-command-args `("-i" "-colors" ,(if mdw-black-background "Linux" "LightBG"))) @@ -673,6 +704,7 @@ (add-hook 'sh-mode-hook #'mdw-setup-sh-script-mode) (add-hook 'autoconf-mode-hook #'mdw-setup-m4) +(add-hook 'autotest-mode-hook #'mdw-setup-m4) (add-hook 'm4-mode-hook #'mdw-setup-m4) (add-hook 'smalltalk-mode-hook 'mdw-fontify-smalltalk t) @@ -718,6 +750,12 @@ ("^pdf$" "." "evince %o") ("^html?$" "." "netscape %o"))) +(setq TeX-view-program-selection + '(((output-dvi style-pstricks) "dvips and gv") + (output-dvi "xdvi") + (output-pdf "Evince") + (output-html "xdg-open"))) + (setq TeX-open-quote "\"" TeX-close-quote "\"") @@ -730,7 +768,7 @@ ("definition" ?D "def:" "~\\ref{%s}" t ("definitions?" "def\\.") -2) ("proposition" ?P "prop:" "~\\ref{%s}" t ("propositions?" "prop\\.") -2) - ("lemma" ?P "lem:" "~\\ref{%s}" t ("lemmas?" "lem\\.") -2) + ("lemma" ?L "lem:" "~\\ref{%s}" t ("lemmas?" "lem\\.") -2) ("example" ?X "eg:" "~\\ref{%s}" t ("examples?") -2) ("exercise" ?E "ex:" "~\\ref{%s}" t ("exercises?" "ex\\.") -2) ("enumerate" ?i "i:" "~\\ref{%s}" item ("items?"))))