X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/08b1b191f94dfa200659b03794ef63bdcc51946e..13c19c5dbc0c5a20a6916061df1a227bad914b54:/el/dot-emacs.el diff --git a/el/dot-emacs.el b/el/dot-emacs.el index 12d0e72..a9e2d72 100644 --- a/el/dot-emacs.el +++ b/el/dot-emacs.el @@ -535,19 +535,22 @@ Evil key bindings are defined in `mdw-evil-keymap-keys'." (let ((home-frame (selected-frame)) (buffer (get-buffer buffer-or-name)) (safe-buffer (get-buffer "*scratch*"))) - (mapc (lambda (frame) - (or (eq frame home-frame) - (mapc (lambda (window) - (and (eq (window-buffer window) buffer) - (set-window-buffer window safe-buffer))) - (window-list frame)))) - (frame-list)))) + (dolist (frame (frame-list)) + (unless (eq frame home-frame) + (dolist (window (window-list frame)) + (when (eq (window-buffer window) buffer) + (set-window-buffer window safe-buffer))))))) (defvar mdw-inhibit-walk-windows nil "If non-nil, then `walk-windows' does nothing. This is used by advice on `switch-to-buffer-other-frame' to inhibit finding buffers in random frames.") +(setq display-buffer--other-frame-action + '((display-buffer-reuse-window display-buffer-pop-up-frame) + (reusable-frames . nil) + (inhibit-same-window . t))) + (defadvice walk-windows (around mdw-inhibit activate) "If `mdw-inhibit-walk-windows' is non-nil, then do nothing." (and (not mdw-inhibit-walk-windows) @@ -1449,6 +1452,10 @@ doesn't match any of the regular expressions in (mdw-define-face comint-highlight-input (t nil)) +(mdw-define-face Man-underline + (((type tty)) :underline t) + (t :slant italic)) + (mdw-define-face ido-subdir (t :foreground "cyan" :weight bold)) @@ -2160,6 +2167,10 @@ name, as a symbol." "Major mode for editing Sod code.") (push '("\\.sod$" . sod-mode) auto-mode-alist) +(dolist (hook '(c-mode-hook objc-mode-hook c++-mode-hook)) + (add-hook hook 'mdw-misc-mode-config t) + (add-hook hook 'mdw-fontify-c-and-c++ t)) + ;;;-------------------------------------------------------------------------- ;;; AP calc mode. @@ -2205,6 +2216,10 @@ name, as a symbol." (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) +(progn + (add-hook 'apcalc-mode-hook 'mdw-misc-mode-config t) + (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t)) + ;;;-------------------------------------------------------------------------- ;;; Java programming configuration. @@ -2281,6 +2296,10 @@ name, as a symbol." (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) +(progn + (add-hook 'java-mode-hook 'mdw-misc-mode-config t) + (add-hook 'java-mode-hook 'mdw-fontify-java t)) + ;;;-------------------------------------------------------------------------- ;;; Javascript programming configuration. @@ -2336,6 +2355,10 @@ name, as a symbol." (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) +(progn + (add-hook 'js-mode-hook 'mdw-misc-mode-config t) + (add-hook 'js-mode-hook 'mdw-fontify-javascript t)) + ;;;-------------------------------------------------------------------------- ;;; Scala programming configuration. @@ -2405,6 +2428,10 @@ name, as a symbol." '(1 "\"") '(4 "\"")))))) +(progn + (add-hook 'scala-mode-hook 'mdw-misc-mode-config t) + (add-hook 'scala-mode-hook 'mdw-fontify-scala t)) + ;;;-------------------------------------------------------------------------- ;;; C# programming configuration. @@ -2476,6 +2503,8 @@ name, as a symbol." (define-derived-mode csharp-mode java-mode "C#" "Major mode for editing C# code.") +(add-hook 'csharp-mode-hook 'mdw-fontify-csharp t) + ;;;-------------------------------------------------------------------------- ;;; F# programming configuration. @@ -2595,6 +2624,11 @@ name, as a symbol." (list "^>" '(0 font-lock-keyword-face))) font-lock-keywords))) +(progn + (add-hook 'fsharp-mode-hook 'mdw-misc-mode-config t) + (add-hook 'fsharp-mode-hook 'mdw-fontify-fsharp t) + (add-hook 'inferior-fsharp-mode-hooks 'mdw-fontify-inferior-fsharp t)) + ;;;-------------------------------------------------------------------------- ;;; Go programming configuration. @@ -2656,6 +2690,9 @@ name, as a symbol." ;; And anything else is punctuation. (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) +(progn + (add-hook 'go-mode-hook 'mdw-misc-mode-config t) + (add-hook 'go-mode-hook 'mdw-fontify-go t)) ;;;-------------------------------------------------------------------------- ;;; Rust programming configuration. @@ -2736,6 +2773,10 @@ name, as a symbol." (local-set-key [?{] 'mdw-self-insert-and-indent) (local-set-key [?}] 'mdw-self-insert-and-indent)) +(progn + (add-hook 'rust-mode-hook 'mdw-misc-mode-config t) + (add-hook 'rust-mode-hook 'mdw-fontify-rust t)) + ;;;-------------------------------------------------------------------------- ;;; Awk programming configuration. @@ -2792,6 +2833,10 @@ name, as a symbol." (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) +(progn + (add-hook 'awk-mode-hook 'mdw-misc-mode-config t) + (add-hook 'awk-mode-hook 'mdw-fontify-awk t)) + ;;;-------------------------------------------------------------------------- ;;; Perl programming style. @@ -2869,9 +2914,18 @@ strip numbers instead." (if (re-search-forward "\\(tests\\s-*=>\\s-*\\)\\w*" nil t) (replace-match (format "\\1%d" i)))))) +(dolist (hook '(perl-mode-hook cperl-mode-hook)) + (add-hook hook 'mdw-misc-mode-config t) + (add-hook hook 'mdw-fontify-perl t)) + ;;;-------------------------------------------------------------------------- ;;; Python programming style. +(setq-default py-indent-offset 2 + python-indent 2 + python-indent-offset 2 + python-fill-docstring-style 'symmetric) + (defun mdw-fontify-pythonic (keywords) ;; Miscellaneous fiddling. @@ -2924,6 +2978,11 @@ strip numbers instead." ("\\.pxi$" . pyrex-mode)) auto-mode-alist)) +(progn + (add-hook 'python-mode-hook 'mdw-misc-mode-config t) + (add-hook 'python-mode-hook 'mdw-fontify-python t) + (add-hook 'pyrex-mode-hook 'mdw-fontify-pyrex t)) + ;;;-------------------------------------------------------------------------- ;;; Lua programming style. @@ -2967,6 +3026,10 @@ strip numbers instead." (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) +(progn + (add-hook 'lua-mode-hook 'mdw-misc-mode-config t) + (add-hook 'lua-mode-hook 'mdw-fontify-lua t)) + ;;;-------------------------------------------------------------------------- ;;; Icon programming style. @@ -3022,6 +3085,10 @@ strip numbers instead." (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) +(progn + (add-hook 'icon-mode-hook 'mdw-misc-mode-config t) + (add-hook 'icon-mode-hook 'mdw-fontify-icon t)) + ;;;-------------------------------------------------------------------------- ;;; Assembler mode. @@ -3045,11 +3112,18 @@ strip numbers instead." (add-hook 'asm-mode-local-variables-hook 'mdw-asm-set-comment) (put 'asm-comment-char 'safe-local-variable 'characterp) +(progn + (add-hook 'asm-mode-hook 'mdw-misc-mode-config t) + (add-hook 'asm-mode-hook 'mdw-fontify-asm t)) + ;;;-------------------------------------------------------------------------- ;;; TCL configuration. +(setq-default tcl-indent-level 2) + (defun mdw-fontify-tcl () - (mapcar #'(lambda (ch) (modify-syntax-entry ch ".")) '(?$)) + (dolist (ch '(?$)) + (modify-syntax-entry ch ".")) (mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)") (make-local-variable 'font-lock-keywords) (setq font-lock-keywords @@ -3061,6 +3135,10 @@ strip numbers instead." (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face))))) +(progn + (add-hook 'tcl-mode-hook 'mdw-misc-mode-config t) + (add-hook 'tcl-mode-hook 'mdw-fontify-tcl t)) + ;;;-------------------------------------------------------------------------- ;;; Dylan programming configuration. @@ -3127,6 +3205,10 @@ strip numbers instead." "\\)") '(0 mdw-punct-face)))))) +(progn + (add-hook 'dylan-mode-hook 'mdw-misc-mode-config t) + (add-hook 'dylan-mode-hook 'mdw-fontify-dylan t)) + ;;;-------------------------------------------------------------------------- ;;; Algol 68 configuration. @@ -3169,6 +3251,10 @@ strip numbers instead." (list "\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/" '(0 mdw-punct-face)))))) +(dolist (hook '(a68-mode-hook a68-mode-hooks)) + (add-hook hook 'mdw-misc-mode-config t) + (add-hook hook 'mdw-fontify-algol-68 t)) + ;;;-------------------------------------------------------------------------- ;;; REXX configuration. @@ -3189,10 +3275,8 @@ strip numbers instead." (setq mdw-auto-indent nil) (local-set-key [?\C-m] 'mdw-rexx-indent-newline-indent) (local-set-key [?*] 'mdw-rexx-electric-*) - (mapcar #'(lambda (ch) (modify-syntax-entry ch "w")) - '(?! ?? ?# ?@ ?$)) - (mapcar #'(lambda (ch) (modify-syntax-entry ch ".")) - '(?¬)) + (dolist (ch '(?! ?? ?# ?@ ?$)) (modify-syntax-entry ch "w")) + (dolist (ch '(?¬)) (modify-syntax-entry ch ".")) (mdw-standard-fill-prefix "\\([ \t]*/?\*[ \t]*\\)") ;; Set up keywords and things for fontification. @@ -3244,9 +3328,18 @@ strip numbers instead." (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) +(progn + (add-hook 'rexx-mode-hook 'mdw-misc-mode-config t) + (add-hook 'rexx-mode-hook 'mdw-fontify-rexx t)) + ;;;-------------------------------------------------------------------------- ;;; Standard ML programming style. +(setq-default sml-nested-if-indent t + sml-case-indent nil + sml-indent-level 4 + sml-type-of-indent nil) + (defun mdw-fontify-sml () ;; Make underscore an honorary letter. @@ -3294,9 +3387,15 @@ strip numbers instead." (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) +(progn + (add-hook 'sml-mode-hook 'mdw-misc-mode-config t) + (add-hook 'sml-mode-hook 'mdw-fontify-sml t)) + ;;;-------------------------------------------------------------------------- ;;; Haskell configuration. +(setq-default haskell-indent-offset 2) + (defun mdw-fontify-haskell () ;; Fiddle with syntax table to get comments right. @@ -3372,6 +3471,10 @@ strip numbers instead." (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) +(progn + (add-hook 'haskell-mode-hook 'mdw-misc-mode-config t) + (add-hook 'haskell-mode-hook 'mdw-fontify-haskell t)) + ;;;-------------------------------------------------------------------------- ;;; Erlang configuration. @@ -3405,6 +3508,10 @@ strip numbers instead." (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) +(progn + (add-hook 'erlang-mode-hook 'mdw-misc-mode-config t) + (add-hook 'erlang-mode-hook 'mdw-fontify-erlang t)) + ;;;-------------------------------------------------------------------------- ;;; Texinfo configuration. @@ -3439,9 +3546,18 @@ strip numbers instead." (list "[{}]+" '(0 mdw-punct-face))))) +(dolist (hook '(texinfo-mode-hook TeXinfo-mode-hook)) + (add-hook hook 'mdw-misc-mode-config t) + (add-hook hook 'mdw-fontify-texinfo t)) + ;;;-------------------------------------------------------------------------- ;;; TeX and LaTeX configuration. +(setq-default LaTeX-table-label "tbl:" + TeX-auto-untabify nil + LaTeX-syntactic-comments nil + LaTeX-fill-break-at-separators '(\\\[)) + (defun mdw-fontify-tex () (setq ispell-parser 'tex) (turn-on-reftex) @@ -3530,10 +3646,81 @@ strip numbers instead." (unless modified (restore-buffer-modified-p nil))))))) -(setq-default LaTeX-syntactic-comments nil - LaTeX-fill-break-at-separators '(\\\[)) - -(add-hook 'bibtex-mode-hook (lambda () (setq fill-column 76))) +(setq TeX-output-view-style + '(("^dvi$" + ("^landscape$" "^pstricks$\\|^pst-\\|^psfrag$") + "%(o?)dvips -t landscape %d -o && xdg-open %f") + ("^dvi$" "^pstricks$\\|^pst-\\|^psfrag$" + "%(o?)dvips %d -o && xdg-open %f") + ("^dvi$" + ("^a4\\(?:dutch\\|paper\\|wide\\)\\|sem-a4$" "^landscape$") + "%(o?)xdvi %dS -paper a4r -s 0 %d") + ("^dvi$" "^a4\\(?:dutch\\|paper\\|wide\\)\\|sem-a4$" + "%(o?)xdvi %dS -paper a4 %d") + ("^dvi$" + ("^a5\\(?:comb\\|paper\\)$" "^landscape$") + "%(o?)xdvi %dS -paper a5r -s 0 %d") + ("^dvi$" "^a5\\(?:comb\\|paper\\)$" "%(o?)xdvi %dS -paper a5 %d") + ("^dvi$" "^b5paper$" "%(o?)xdvi %dS -paper b5 %d") + ("^dvi$" "^letterpaper$" "%(o?)xdvi %dS -paper us %d") + ("^dvi$" "^legalpaper$" "%(o?)xdvi %dS -paper legal %d") + ("^dvi$" "^executivepaper$" "%(o?)xdvi %dS -paper 7.25x10.5in %d") + ("^dvi$" "." "%(o?)xdvi %dS %d") + ("^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 "mupdf") + (output-html "sensible-browser"))) + +(setq TeX-open-quote "\"" + TeX-close-quote "\"") + +(setq reftex-use-external-file-finders t + reftex-auto-recenter-toc t) + +(setq reftex-label-alist + '(("theorem" ?T "th:" "~\\ref{%s}" t ("theorems?" "th\\.") -2) + ("axiom" ?A "ax:" "~\\ref{%s}" t ("axioms?" "ax\\.") -2) + ("definition" ?D "def:" "~\\ref{%s}" t ("definitions?" "def\\.") -2) + ("proposition" ?P "prop:" "~\\ref{%s}" t + ("propositions?" "prop\\.") -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?")))) +(setq reftex-section-prefixes + '((0 . "part:") + (1 . "ch:") + (t . "sec:"))) + +(setq bibtex-field-delimiters 'double-quotes + bibtex-align-at-equal-sign t + bibtex-entry-format '(realign opts-or-alts required-fields + numerical-fields last-comma delimiters + unify-case sort-fields braces) + bibtex-sort-ignore-string-entries nil + bibtex-maintain-sorted-entries 'entry-class + bibtex-include-OPTkey t + bibtex-autokey-names-stretch 1 + bibtex-autokey-expand-strings t + bibtex-autokey-name-separator "-" + bibtex-autokey-year-length 4 + bibtex-autokey-titleword-separator "-" + bibtex-autokey-name-year-separator "-" + bibtex-autokey-year-title-separator ":") + +(progn + (dolist (hook '(tex-mode-hook latex-mode-hook + TeX-mode-hook LaTeX-mode-hook)) + (add-hook hook 'mdw-misc-mode-config t) + (add-hook hook 'mdw-fontify-tex t)) + (add-hook 'bibtex-mode-hook (lambda () (setq fill-column 76)))) ;;;-------------------------------------------------------------------------- ;;; HTML, CSS, and other web foolishness. @@ -3543,6 +3730,8 @@ strip numbers instead." ;;;-------------------------------------------------------------------------- ;;; SGML hacking. +(setq-default psgml-html-build-new-buffer nil) + (defun mdw-sgml-mode () (interactive) (sgml-mode) @@ -3589,11 +3778,14 @@ that character only to be normal punctuation.") nil) (t (let ((table (copy-syntax-table (syntax-table)))) - (mapc (lambda (ch) (modify-syntax-entry ch "." table)) - (if (listp flag) flag (list flag))) + (dolist (ch (if (listp flag) flag (list flag))) + (modify-syntax-entry ch "." table)) (set-syntax-table table) (and font-lock-mode (font-lock-fontify-buffer))))))) -(add-hook 'conf-mode-local-variables-hook 'mdw-fix-up-quote t t) + +(progn + (add-hook 'conf-mode-hook 'mdw-misc-mode-config t) + (add-hook 'conf-mode-local-variables-hook 'mdw-fix-up-quote t t)) ;;;-------------------------------------------------------------------------- ;;; Shell scripts. @@ -3663,6 +3855,10 @@ that character only to be normal punctuation.") (cons (cons 'rc frag) sh-mode-syntax-table-input)))))) +(progn + (add-hook 'sh-mode-hook 'mdw-misc-mode-config t) + (add-hook 'sh-mode-hook 'mdw-setup-sh-script-mode t)) + ;;;-------------------------------------------------------------------------- ;;; Emacs shell mode. @@ -3786,9 +3982,11 @@ that character only to be normal punctuation.") messages-mode-keywords))) (run-hooks 'cpp-messages-mode-hook)) -(add-hook 'messages-mode-hook 'mdw-misc-mode-config t) -(add-hook 'cpp-messages-mode-hook 'mdw-misc-mode-config t) -; (add-hook 'messages-file-hook 'mdw-fontify-messages t) +(progn + (add-hook 'messages-mode-hook 'mdw-misc-mode-config t) + (add-hook 'cpp-messages-mode-hook 'mdw-misc-mode-config t) + ;; (add-hook 'messages-file-hook 'mdw-fontify-messages t) + ) ;;;-------------------------------------------------------------------------- ;;; Messages-file mode. @@ -3836,7 +4034,8 @@ that character only to be normal punctuation.") (setq comment-end "") (run-hooks 'mallow-driver-mode-hook)) -(add-hook 'mallow-driver-hook 'mdw-misc-mode-config t) +(progn + (add-hook 'mallow-driver-hook 'mdw-misc-mode-config t)) ;;;-------------------------------------------------------------------------- ;;; NFast debugs. @@ -3946,6 +4145,45 @@ that character only to be normal punctuation.") (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face))))) +;; 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)))) + (or (boundp 'slime-lisp-implementations) + (setq slime-lisp-implementations nil)) + (while stuff + (let* ((head (car stuff)) + (found (assq (car head) slime-lisp-implementations))) + (setq stuff (cdr stuff)) + (if found + (rplacd found (cdr head)) + (setq slime-lisp-implementations + (cons head slime-lisp-implementations)))))) +(setq slime-default-lisp 'sbcl) + +;; Hooks. + +(progn + (dolist (hook '(emacs-lisp-mode-hook + scheme-mode-hook + lisp-mode-hook + inferior-lisp-mode-hook + lisp-interaction-mode-hook + ielm-mode-hook + slime-repl-mode-hook)) + (add-hook hook 'mdw-misc-mode-config t) + (add-hook hook 'mdw-fontify-lispy t)) + (add-hook 'lisp-mode-hook 'mdw-common-lisp-indent t) + (add-hook 'inferior-lisp-mode-hook + #'(lambda () (local-set-key "\C-m" 'comint-send-and-indent)) t)) + ;;;-------------------------------------------------------------------------- ;;; Other languages. @@ -3971,6 +4209,10 @@ that character only to be normal punctuation.") (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face))))) +(progn + (add-hook 'smalltalk-mode 'mdw-misc-mode-config t) + (add-hook 'smalltalk-mode 'mdw-fontify-smalltalk t)) + ;; m4. (defun mdw-setup-m4 () @@ -3983,6 +4225,15 @@ that character only to be normal punctuation.") ;; Fill prefix. (mdw-standard-fill-prefix "\\([ \t]*\\(?:#+\\|\\\\)[ \t]*\\)")) +(dolist (hook '(m4-mode-hook autoconf-mode-hook autotest-mode-hook)) + (add-hook hook #'mdw-misc-mode-config t) + (add-hook hook #'mdw-setup-m4 t)) + +;; Make. + +(progn + (add-hook 'makefile-mode-hook 'mdw-misc-mode-config t)) + ;;;-------------------------------------------------------------------------- ;;; Text mode. @@ -3996,6 +4247,9 @@ that character only to be normal punctuation.") (eval-after-load "flyspell" '(define-key flyspell-mode-map "\C-\M-i" nil)) +(progn + (add-hook 'text-mode-hook 'mdw-text-mode t)) + ;;;-------------------------------------------------------------------------- ;;; Outline and hide/show modes. @@ -4089,7 +4343,7 @@ This allows you to pass a list of arguments through `ansi-term'." ;;;-------------------------------------------------------------------------- ;;; Magit configuration. -(setq magit-diff-refine-hunk 'all +(setq magit-diff-refine-hunk 't magit-view-git-manual-method 'man magit-log-margin '(nil age magit-log-margin-width t 18) magit-wip-after-save-local-mode-lighter ""