X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/58dc21cf6359b182e26752b055eab9f48f6cfa47..9b6762e9134311567c4c70b2de79c88d72fc74ad:/dot/emacs diff --git a/dot/emacs b/dot/emacs index 3f8b68e..9dd28f2 100644 --- a/dot/emacs +++ b/dot/emacs @@ -134,7 +134,9 @@ edit-server-new-frame nil gnuserv-frame t) (trap (let ((warning-suppress-types - (cons '(server) warning-suppress-types))) + (cons '(server) + (and (boundp 'warning-suppress-types) + warning-suppress-types)))) (server-start))) (trap (progn (require 'edit-server) @@ -313,7 +315,7 @@ ;; Splash screen stuff. -(or window-system +(if (not mdw-splashy-startup) (setq inhibit-splash-screen t inhibit-startup-message t)) @@ -399,7 +401,6 @@ (tooltip-mode 0) (tool-bar-mode 0)) (trap (or mdw-fast-startup (global-auto-revert-mode t))) -(setq psgml-html-build-new-buffer nil) (defvar mdw-black-background t) @@ -416,6 +417,8 @@ (setq cltl2-root-url (mdw-config 'cltl-url)) (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url)) +(setq ediff-split-window-function 'split-window-horizontally) + (setq rfcview-rfc-location-pattern "/ftp@mirror.distorted.org.uk:/pub/mirrors/rfc/rfc%s.txt" rfcview-std-location-pattern @@ -536,7 +539,7 @@ (display-time) (column-number-mode 1) (trap - (if (and window-system (not mdw-fast-startup)) + (if mdw-splashy-startup (let ((calendar-view-diary-initially-flag t)) (calendar)))) @@ -617,20 +620,31 @@ (windmove-default-keybindings)) (setq windmove-wrap-around t) (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" - "\\)" - "\\'"))))) + (require 'ido-completing-read+) + (unless (fboundp 'ido-ubiquitous-mode) (require 'ido-ubiquitous)) + (ido-ubiquitous-mode 1) + (setq ido-cr+-max-items nil) + (let ((excludes `(,(concat "\\`" + "gtags-find-" + "\\(" "tag" + "\\|file" + "\\|rtag" + "\\|symbol" + "\\)" + "\\(" "\\|-other-window" + "\\)" + "\\'")))) + (if (boundp 'ido-ubiquitous-command-overrides) + (setq ido-ubiquitous-command-overrides + (append ido-ubiquitous-command-overrides + (mapcar (lambda (exclude) + (if (symbolp exclude) + `(enable-old exact + ,(symbol-name exclude)) + `(enable-old regexp ,exclude))) + excludes))) + (setq ido-cr+-function-blacklist + (append ido-cr+-function-blacklist excludes)))) (setq magit-completing-read-function 'magit-ido-completing-read) (require 'smex) (smex-initialize) (global-set-key [?\M-x] 'smex)) @@ -809,22 +823,6 @@ (make-variable-buffer-local 'mdw-auto-indent) -(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 dylan-mode-hook - python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook - tcl-mode-hook go-mode-hook js-mode-hook javascript-mode-hook - conf-mode-hook m4-mode-hook autoconf-mode-hook autotest-mode-hook - a68-mode-hook a68-mode-hooks asm-mode-hook fsharp-mode-hook - scala-mode-hook rust-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 ielm-mode-hook - sml-mode-hook haskell-mode-hook erlang-mode-hook - smalltalk-mode-hook rexx-mode-hook lua-mode-hook - arm-assembler-mode-hook)) - (global-font-lock-mode t) ;;;-------------------------------------------------------------------------- @@ -887,181 +885,9 @@ lazy-lock-stealth-lines 100 lazy-lock-stealth-verbose t) -(progn - (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 '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) - (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t) - - (add-hook 'java-mode-hook 'mdw-fontify-java t) - (add-hook 'scala-mode-hook 'mdw-fontify-scala t) - (add-hook 'js-mode-hook 'mdw-fontify-javascript t) - (add-hook 'csharp-mode-hook 'mdw-fontify-csharp t) - (add-hook 'fsharp-mode-hook 'mdw-fontify-fsharp t) - (add-hook 'inferior-fsharp-mode-hooks 'mdw-fontify-inferior-fsharp t) - - (add-hook 'awk-mode-hook 'mdw-fontify-awk t) - - (add-hook 'perl-mode-hook 'mdw-fontify-perl t) - (add-hook 'cperl-mode-hook 'mdw-fontify-perl t)) - -(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"))) - (add-hook 'python-mode-hook 'mdw-fontify-python t) - (add-hook 'pyrex-mode-hook 'mdw-fontify-pyrex t)) - -(setq-default tcl-indent-level 2) -(add-hook 'tcl-mode-hook 'mdw-fontify-tcl t) - -(add-hook 'rexx-mode-hook 'mdw-fontify-rexx t) - -(setq sml-nested-if-indent t - sml-case-indent nil - sml-indent-level 4 - sml-type-of-indent nil) -(add-hook 'sml-mode-hook 'mdw-fontify-sml t) - -(add-hook 'haskell-mode-hook 'mdw-fontify-haskell t) -(setq-default haskell-indent-offset 2) - -(add-hook 'erlang-mode-hook 'mdw-fontify-erlang t) - -(add-hook 'texinfo-mode-hook 'mdw-fontify-texinfo t) -(add-hook 'TeXinfo-mode-hook 'mdw-fontify-texinfo t) - -(setq LaTeX-table-label "tbl:") -(setq TeX-auto-untabify nil) -(add-hook 'TeX-mode-hook 'mdw-fontify-tex t) -(add-hook 'tex-mode-hook 'mdw-fontify-tex t) -(add-hook 'LaTeX-mode-hook 'mdw-fontify-tex t) -(add-hook 'latex-mode-hook 'mdw-fontify-tex t) - -(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) -(add-hook 'smalltalk-mode-hook 'mdw-setup-smalltalk t) - -(add-hook 'a68-mode-hook 'mdw-fontify-algol-68 t) -(add-hook 'a68-mode-hooks 'mdw-fontify-algol-68 t) -(add-hook 'dylan-mode-hook 'mdw-fontify-dylan t) - -(progn - (add-hook 'emacs-lisp-mode-hook 'mdw-fontify-lispy t) - (add-hook 'scheme-mode-hook 'mdw-fontify-lispy t) - (add-hook 'lisp-mode-hook 'mdw-fontify-lispy t) - (add-hook 'inferior-lisp-mode-hook 'mdw-fontify-lispy t) - (add-hook 'lisp-interaction-mode-hook 'mdw-fontify-lispy t) - (add-hook 'ielm-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) - (add-hook 'inferior-lisp-mode-hook - #'(lambda () - (local-set-key "\C-m" 'comint-send-and-indent)) t)) - -(add-hook 'text-mode-hook 'mdw-text-mode t) - -;;;-------------------------------------------------------------------------- -;;; TeX stuff. - -(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) - bibtex-include-OPTkey t) - -;;;-------------------------------------------------------------------------- -;;; 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) +;; Late, for `mdw-black-background'. +(setq-default py-python-command-args + `("-i" "-colors" ,(if mdw-black-background "Linux" "LightBG"))) ;;;-------------------------------------------------------------------------- ;;; Blogging.