X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/853d8555c057dc9e2d8a7f641fbfbb94beee9f2e..3782446f0bbdc76405aadc6c73f78ce37153fd55:/el/dot-emacs.el diff --git a/el/dot-emacs.el b/el/dot-emacs.el index ac20c56..23b2c97 100644 --- a/el/dot-emacs.el +++ b/el/dot-emacs.el @@ -24,19 +24,28 @@ ;;;-------------------------------------------------------------------------- ;;; Check command-line. +(defun mdw-check-command-line-switch (switch) + (let ((probe nil) (next command-line-args) (found nil)) + (while next + (cond ((string= (car next) switch) + (setq found t) + (if probe (rplacd probe (cdr next)) + (setq command-line-args (cdr next)))) + (t + (setq probe next))) + (setq next (cdr next))) + found)) + (defvar mdw-fast-startup nil "Whether .emacs should optimize for rapid startup. This may be at the expense of cool features.") -(let ((probe nil) (next command-line-args)) - (while next - (cond ((string= (car next) "--mdw-fast-startup") - (setq mdw-fast-startup t) - (if probe - (rplacd probe (cdr next)) - (setq command-line-args (cdr next)))) - (t - (setq probe next))) - (setq next (cdr next)))) +(setq mdw-fast-startup + (mdw-check-command-line-switch "--mdw-fast-startup")) + +(defvar mdw-splashy-startup nil + "Whether to show a splash screen and related frippery.") +(setq mdw-splashy-startup + (mdw-check-command-line-switch "--mdw-splashy-startup")) ;;;-------------------------------------------------------------------------- ;;; Some general utilities. @@ -160,6 +169,17 @@ library." (set-frame-parameter frame 'menu-bar-lines 0) (set-frame-parameter frame 'menu-bar-lines old))) +;; Page motion. + +(defun mdw-fixup-page-position () + (unless (eq (char-before (point)) ? ) + (forward-line 0))) + +(defadvice backward-page (after mdw-fixup compile activate) + (mdw-fixup-page-position)) +(defadvice forward-page (after mdw-fixup compile activate) + (mdw-fixup-page-position)) + ;; Splitting windows. (unless (fboundp 'scroll-bar-columns) @@ -231,6 +251,14 @@ P") sb-width)) (mdw-divvy-window width))) +(defvar mdw-frame-width-fudge + (cond ((<= emacs-major-version 20) 1) + ((= emacs-major-version 26) 3) + (t 0)) + "The number of extra columns to add to the desired frame width. + +This is sadly necessary because Emacs 26 is broken in this regard.") + ;; Don't raise windows unless I say so. (defvar mdw-inhibit-raise-frame nil @@ -254,6 +282,7 @@ frame is actually mapped on the screen." (mdw-advise-to-inhibit-raise-frame select-frame-set-input-focus) (mdw-advise-to-inhibit-raise-frame appt-disp-window) +(mdw-advise-to-inhibit-raise-frame mouse-select-window) ;; Bug fix for markdown-mode, which breaks point positioning during ;; `query-replace'. @@ -337,9 +366,9 @@ as output rather than a string." (months ["Chaos" "Discord" "Confusion" "Bureaucracy" "Aftermath"]) (day-count [0 31 59 90 120 151 181 212 243 273 304 334]) - (year (- (extract-calendar-year date) 1900)) - (month (1- (extract-calendar-month date))) - (day (1- (extract-calendar-day date))) + (year (- (calendar-extract-year date) 1900)) + (month (1- (calendar-extract-month date))) + (day (1- (calendar-extract-day date))) (julian (+ (aref day-count month) day)) (dyear (+ year 3066))) (if (and (= month 1) (= day 28)) @@ -394,6 +423,8 @@ as output rather than a string." (let ((mdw-diary-for-org-mode-p t)) ad-do-it)) +(defvar diary-time-regexp nil) + (defadvice diary-add-to-list (before mdw-trim-leading-space compile activate) "Trim leading space from the diary entry string." (save-match-data @@ -525,19 +556,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) @@ -554,6 +588,15 @@ Even if an existing window in some random frame looks tempting." Pretend they don't exist. They might be on other display devices." (ad-set-arg 2 nil)) +;; Rename buffers along with files. + +(defadvice rename-file (after mdw-rename-buffers (from to &optional forcep) + compile activate) + (let ((buffer (get-file-buffer from))) + (when buffer + (with-current-buffer buffer + (set-visited-file-name to nil t))))) + ;;;-------------------------------------------------------------------------- ;;; Improved compilation machinery. @@ -577,7 +620,7 @@ Pretend they don't exist. They might be on other display devices." (defadvice compile (around hack-environment compile activate) "Hack the environment inherited by inferiors in the compilation." - (let ((process-environment process-environment)) + (let ((process-environment (copy-tree process-environment))) (setenv "LD_PRELOAD" nil) ad-do-it)) @@ -785,7 +828,7 @@ Use this to arrange for per-server settings.") (delete-region (+ (match-beginning 0) 2) (point)) (setq string (buffer-substring (point) (+ (point) size))) (delete-region (point) (+ (point) size)) - (insert (format "%S" (mm-subst-char-in-string ?\n ?\s string))) + (insert (format "%S" (subst-char-in-string ?\n ?\s string))) ;; [mdw] missing from upstream (backward-char 1)) (beginning-of-line) @@ -831,6 +874,18 @@ Use this to arrange for per-server settings.") '(defalias 'nnimap-transform-headers (symbol-function 'mdw-nnimap-transform-headers))) +(defadvice gnus-other-frame (around mdw-hack-frame-width compile activate) + "Always arrange for mail/news frames to be 80 columns wide." + (let ((default-frame-alist (cons `(width . ,(+ 80 mdw-frame-width-fudge)) + (cl-delete 'width default-frame-alist + :key #'car)))) + ad-do-it)) + +;; Preferred programs. + +(setq mailcap-user-mime-data + '(((type . "application/pdf") (viewer . "mupdf %s")))) + ;;;-------------------------------------------------------------------------- ;;; Utility functions. @@ -898,7 +953,7 @@ in REST." (erase-buffer) (shell-command "date +%Y-%m-%d" t) (goto-char (mark)) - (delete-backward-char 1) + (delete-char -1) (buffer-string)) (kill-buffer buffer)))))) @@ -969,6 +1024,21 @@ tramp, which seems to get itself into a twist." (let ((auto-revert-check-vc-info t)) (auto-revert-buffers))) +(defun comint-send-and-indent () + (interactive) + (comint-send-input) + (and mdw-auto-indent + (indent-for-tab-command))) + +(defadvice comint-line-beginning-position + (around mdw-calculate-it-properly () activate compile) + "Calculate the actual line start for multi-line input." + (if (or comint-use-prompt-regexp + (eq (field-at-pos (point)) 'output)) + ad-do-it + (setq ad-return-value + (constrain-to-field (line-beginning-position) (point))))) + ;;;-------------------------------------------------------------------------- ;;; Dired hacking. @@ -1034,8 +1104,7 @@ If NEW-SESSION-P, start a new session." '(define-key w3m-mode-map [?\e ?\r] 'w3m-view-this-url-new-session)) (defvar mdw-good-url-browsers - '(browse-url-chromium - browse-url-mozilla + '(browse-url-mozilla browse-url-generic (w3m . mdw-w3m-browse-url) browse-url-w3) @@ -1231,7 +1300,14 @@ case." (set (make-local-variable 'mdw-do-misc-mode-hacking) t) (local-set-key [C-return] 'newline) (make-local-variable 'page-delimiter) - (setq page-delimiter "\f\\|^.*-\\{6\\}.*$") + (setq page-delimiter (concat "^" "\f" + "\\|" "^" + ".\\{0,4\\}" + "-\\{5\\}" + "\\(" " " ".*" " " "\\)?" + "-+" + ".\\{0,2\\}" + "$")) (setq comment-column 40) (auto-fill-mode 1) (setq fill-column mdw-text-width) @@ -1371,11 +1447,12 @@ doesn't match any of the regular expressions in (((type w32)) :family "courier new" :height 85) (((type x)) :family "6x13" :foundry "trad" :height 130) (t :foreground "white" :background "black")) -(if (mdw-emacs-version-p 23) - (mdw-define-face variable-pitch - (((type x)) :family "sans" :height 100)) - (mdw-define-face variable-pitch - (((type x)) :family "helvetica" :height 90))) +(mdw-define-face fixed-pitch-serif + (((type w32)) :family "courier new" :height 85 :weight bold) + (((type x)) :family "6x13" :foundry "trad" :height 130 :weight bold) + (t :foreground "white" :background "black" :weight bold)) +(mdw-define-face variable-pitch + (((type x)) :family "helvetica" :height 120)) (mdw-define-face region (((min-colors 64)) :background "grey30") (((class color)) :background "blue") @@ -1425,6 +1502,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)) @@ -1819,6 +1900,21 @@ doesn't match any of the regular expressions in mdw-point-overlay-mode (lambda () (if (not (minibufferp)) (mdw-point-overlay-mode t)))) +(defvar mdw-terminal-title-alist nil) +(defun mdw-update-terminal-title () + (when (let ((term (frame-parameter nil 'tty-type))) + (and term (string-match "^xterm" term))) + (let* ((tty (frame-parameter nil 'tty)) + (old (assoc tty mdw-terminal-title-alist)) + (new (format-mode-line frame-title-format))) + (unless (and old (equal (cdr old) new)) + (if old (rplacd old new) + (setq mdw-terminal-title-alist + (cons (cons tty new) mdw-terminal-title-alist))) + (send-string-to-terminal (concat "\e]2;" new "\e\\")))))) + +(add-hook 'post-command-hook 'mdw-update-terminal-title) + ;;;-------------------------------------------------------------------------- ;;; C programming configuration. @@ -2080,7 +2176,7 @@ name, as a symbol." "__typeof__" ;GCC "__volatile__" ;GCC )) - (c-constants + (c-builtins (mdw-regexps "false" ;C++, C99 macro "this" ;C++ "true" ;C++, C99 macro @@ -2116,7 +2212,7 @@ name, as a symbol." (list (concat "\\<\\(" c-keywords "\\)\\>") '(0 font-lock-keyword-face)) - (list (concat "\\<\\(" c-constants "\\)\\>") + (list (concat "\\<\\(" c-builtins "\\)\\>") '(0 font-lock-variable-name-face)) ;; Handle numbers too. @@ -2136,6 +2232,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. @@ -2181,6 +2281,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. @@ -2229,7 +2333,7 @@ name, as a symbol." "void" "volatile" "while")) - (java-constants + (java-builtins (mdw-regexps "false" "null" "super" "this" "true"))) (setq font-lock-keywords @@ -2239,8 +2343,8 @@ name, as a symbol." (list (concat "\\<\\(" java-keywords "\\)\\>") '(0 font-lock-keyword-face)) - ;; Handle the magic constants defined above. - (list (concat "\\<\\(" java-constants "\\)\\>") + ;; Handle the magic builtins defined above. + (list (concat "\\<\\(" java-builtins "\\)\\>") '(0 font-lock-variable-name-face)) ;; Handle numbers too. @@ -2257,6 +2361,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. @@ -2282,11 +2390,8 @@ name, as a symbol." "private" "protected" "public" "return" "short" "static" "super" "switch" "synchronized" "throw" "throws" "transient" "try" "typeof" "var" "void" - "volatile" "while" "with" "yield" - - "boolean" "byte" "char" "double" "float" "int" "long" - "short" "void")) - (javascript-constants + "volatile" "while" "with" "yield")) + (javascript-builtins (mdw-regexps "false" "null" "undefined" "Infinity" "NaN" "true" "arguments" "this"))) @@ -2297,8 +2402,8 @@ name, as a symbol." (list (concat "\\_<\\(" javascript-keywords "\\)\\_>") '(0 font-lock-keyword-face)) - ;; Handle the predefined constants defined above. - (list (concat "\\_<\\(" javascript-constants "\\)\\_>") + ;; Handle the predefined builtins defined above. + (list (concat "\\_<\\(" javascript-builtins "\\)\\_>") '(0 font-lock-variable-name-face)) ;; Handle numbers too. @@ -2315,6 +2420,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. @@ -2384,6 +2493,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. @@ -2424,7 +2537,7 @@ name, as a symbol." "unsafe" "ushort" "using" "virtual" "void" "volatile" "while" "yield")) - (csharp-constants + (csharp-builtins (mdw-regexps "base" "false" "null" "this" "true"))) (setq font-lock-keywords @@ -2434,8 +2547,8 @@ name, as a symbol." (list (concat "\\<\\(" csharp-keywords "\\)\\>") '(0 font-lock-keyword-face)) - ;; Handle the magic constants defined above. - (list (concat "\\<\\(" csharp-constants "\\)\\>") + ;; Handle the magic builtins defined above. + (list (concat "\\<\\(" csharp-builtins "\\)\\>") '(0 font-lock-variable-name-face)) ;; Handle numbers too. @@ -2455,6 +2568,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. @@ -2574,6 +2689,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. @@ -2635,6 +2755,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. @@ -2649,15 +2772,17 @@ name, as a symbol." (defun mdw-fontify-rust () ;; Hack syntax categories. + (modify-syntax-entry ?$ ".") + (modify-syntax-entry ?% ".") (modify-syntax-entry ?= ".") ;; Fontify keywords and things. (make-local-variable 'font-lock-keywords) (let ((rust-keywords - (mdw-regexps "abstract" "alignof" "as" + (mdw-regexps "abstract" "alignof" "as" "async" "await" "become" "box" "break" - "const" "continue" "create" - "do" + "const" "continue" "crate" + "do" "dyn" "else" "enum" "extern" "final" "fn" "for" "if" "impl" "in" @@ -2667,8 +2792,8 @@ name, as a symbol." "priv" "proc" "pub" "pure" "ref" "return" "sizeof" "static" "struct" "super" - "trait" "type" "typeof" - "unsafe" "unsized" "use" + "trait" "try" "type" "typeof" + "union" "unsafe" "unsized" "use" "virtual" "where" "while" "yield")) @@ -2701,7 +2826,7 @@ name, as a symbol." "\\|" "0o[0-7_]+" "\\|" "0b[01_]+" "\\)" - "\\([ui]\\(8\\|16\\|32\\|64\\|s\\|size\\)\\)?" + "\\([ui]\\(8\\|16\\|32\\|64\\|size\\)\\)?" "\\)\\_>") '(0 mdw-number-face)) @@ -2713,6 +2838,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. @@ -2769,19 +2898,23 @@ 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. ;; Perl indentation style. -(setq perl-indent-level 2) +(setq-default perl-indent-level 2) -(setq cperl-indent-level 2) -(setq cperl-continued-statement-offset 2) -(setq cperl-continued-brace-offset 0) -(setq cperl-brace-offset -2) -(setq cperl-brace-imaginary-offset 0) -(setq cperl-label-offset 0) +(setq-default cperl-indent-level 2 + cperl-continued-statement-offset 2 + cperl-continued-brace-offset 0 + cperl-brace-offset -2 + cperl-brace-imaginary-offset 0 + cperl-label-offset 0) ;; Define perl fontification style. @@ -2846,9 +2979,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. @@ -2865,9 +3007,9 @@ strip numbers instead." '(0 font-lock-keyword-face)) ;; At least numbers are simpler than C. - (list (concat "\\_<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|" - "\\_<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)" - "\\([eE]\\([-+]\\|\\)[0-9_]+\\|[lL]\\|\\)") + (list (concat "\\_<0\\([xX][0-9a-fA-F]+\\|[oO]?[0-7]+\\|[bB][01]+\\)\\|" + "\\_<[0-9][0-9]*\\(\\.[0-9]*\\|\\)" + "\\([eE]\\([-+]\\|\\)[0-9]+\\|[lL]\\|\\)") '(0 mdw-number-face)) ;; And anything else is punctuation. @@ -2901,10 +3043,15 @@ 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. -(setq lua-indent-level 2) +(setq-default lua-indent-level 2) (defun mdw-fontify-lua () @@ -2944,15 +3091,19 @@ 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. ;; Icon indentation style. -(setq icon-brace-offset 0 - icon-continued-brace-offset 0 - icon-continued-statement-offset 2 - icon-indent-level 2) +(setq-default icon-brace-offset 0 + icon-continued-brace-offset 0 + icon-continued-statement-offset 2 + icon-indent-level 2) ;; Define Icon fontification style. @@ -2999,6 +3150,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. @@ -3007,22 +3162,33 @@ strip numbers instead." (modify-syntax-entry ?. "w") (modify-syntax-entry ?\n ">") (setf fill-prefix nil) + (modify-syntax-entry ?. "_") + (modify-syntax-entry ?* ". 23") + (modify-syntax-entry ?/ ". 124b") + (modify-syntax-entry ?\n "> b") (local-set-key ";" 'self-insert-command) (mdw-standard-fill-prefix "\\([ \t]*;+[ \t]*\\)")) (defun mdw-asm-set-comment () (modify-syntax-entry ?; "." ) - (modify-syntax-entry asm-comment-char "]+\\(\\]\\|>>?\\)") +(setq-default eshell-prompt-function 'mdw-eshell-prompt) +(setq-default eshell-prompt-regexp "^\\[[^]>]+\\(\\]\\|>>?\\)") (defun eshell/e (file) (find-file file) nil) (defun eshell/ee (file) (find-file-other-window file) nil) @@ -3750,9 +4047,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. @@ -3800,7 +4099,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. @@ -3843,31 +4143,7 @@ that character only to be normal punctuation.") (run-hooks 'nfast-debug-mode-hook)) ;;;-------------------------------------------------------------------------- -;;; Other languages. - -;; Smalltalk. - -(defun mdw-setup-smalltalk () - (and mdw-auto-indent - (local-set-key "\C-m" 'smalltalk-newline-and-indent)) - (make-local-variable 'mdw-auto-indent) - (setq mdw-auto-indent nil) - (local-set-key "\C-i" 'smalltalk-reindent)) - -(defun mdw-fontify-smalltalk () - (make-local-variable 'font-lock-keywords) - (setq font-lock-keywords - (list - (list "\\<[A-Z][a-zA-Z0-9]*\\>" - '(0 font-lock-keyword-face)) - (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|" - "[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)" - "\\([eE]\\([-+]\\|\\)[0-9_]+\\|\\)") - '(0 mdw-number-face)) - (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" - '(0 mdw-punct-face))))) - -;; Lispy languages. +;;; Lispy languages. ;; Unpleasant bodge. (unless (boundp 'slime-repl-mode-map) @@ -3891,9 +4167,19 @@ that character only to be normal punctuation.") (make-local-variable 'lisp-indent-function) (setq lisp-indent-function 'common-lisp-indent-function)) -(setq lisp-simple-loop-indentation 2 - lisp-loop-keyword-indentation 6 - lisp-loop-forms-indentation 6) +(setq-default lisp-simple-loop-indentation 2 + lisp-loop-keyword-indentation 6 + lisp-loop-forms-indentation 6) + +(defmacro mdw-advise-hyperspec-lookup (func args) + `(defadvice ,func (around mdw-browse-w3m ,args activate compile) + (if (fboundp 'w3m) + (let ((browse-url-browser-function #'mdw-w3m-browse-url)) + ad-do-it) + ad-do-it))) +(mdw-advise-hyperspec-lookup common-lisp-hyperspec (symbol)) +(mdw-advise-hyperspec-lookup common-lisp-hyperspec-format (char)) +(mdw-advise-hyperspec-lookup common-lisp-hyperspec-lookup-reader-macro (char)) (defun mdw-fontify-lispy () @@ -3924,20 +4210,75 @@ that character only to be normal punctuation.") (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face))))) -(defun comint-send-and-indent () - (interactive) - (comint-send-input) +;; 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. + +;; Smalltalk. + +(defun mdw-setup-smalltalk () (and mdw-auto-indent - (indent-for-tab-command))) + (local-set-key "\C-m" 'smalltalk-newline-and-indent)) + (make-local-variable 'mdw-auto-indent) + (setq mdw-auto-indent nil) + (local-set-key "\C-i" 'smalltalk-reindent)) -(defadvice comint-line-beginning-position - (around mdw-calculate-it-properly () activate compile) - "Calculate the actual line start for multi-line input." - (if (or comint-use-prompt-regexp - (eq (field-at-pos (point)) 'output)) - ad-do-it - (setq ad-return-value - (constrain-to-field (line-beginning-position) (point))))) +(defun mdw-fontify-smalltalk () + (make-local-variable 'font-lock-keywords) + (setq font-lock-keywords + (list + (list "\\<[A-Z][a-zA-Z0-9]*\\>" + '(0 font-lock-keyword-face)) + (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|" + "[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)" + "\\([eE]\\([-+]\\|\\)[0-9_]+\\|\\)") + '(0 mdw-number-face)) + (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 () @@ -3949,6 +4290,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. @@ -3962,6 +4312,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. @@ -4023,13 +4376,13 @@ This allows you to pass a list of arguments through `ansi-term'." (defadvice term-exec-1 (around hack-environment compile activate) "Hack the environment inherited by inferiors in the terminal." - (let ((process-environment process-environment)) + (let ((process-environment (copy-tree process-environment))) (setenv "LD_PRELOAD" nil) ad-do-it)) (defadvice shell (around hack-environment compile activate) "Hack the environment inherited by inferiors in the shell." - (let ((process-environment process-environment)) + (let ((process-environment (copy-tree process-environment))) (setenv "LD_PRELOAD" nil) ad-do-it)) @@ -4055,7 +4408,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 "" @@ -4147,6 +4500,41 @@ there is sadness." (set-window-dedicated-p (or window (selected-window)) nil)) ;;;-------------------------------------------------------------------------- +;;; Man pages. + +;; Turn off `noip' when running `man': it interferes with `man-db''s own +;; seccomp(2)-based sandboxing, which is (in this case, at least) strictly +;; better. +(defadvice Man-getpage-in-background + (around mdw-inhibit-noip (topic) compile activate) + "Inhibit the `noip' preload hack when invoking `man'." + (let* ((old-preload (getenv "LD_PRELOAD")) + (preloads (save-match-data (split-string old-preload ":"))) + (any nil) + (filtered nil)) + (while preloads + (let ((item (pop preloads))) + (if (save-match-data + (string-match "\\(/\\|^\\)noip\.so\\(:\\|$\\)" item)) + (setq any t) + (push item filtered)))) + (if any + (unwind-protect + (progn + (setenv "LD_PRELOAD" + (and filtered + (with-output-to-string + (setq filtered (nreverse filtered)) + (let ((first t)) + (while filtered + (if first (setq first nil) + (write-char ?:)) + (write-string (pop filtered))))))) + ad-do-it) + (setenv "LD_PRELOAD" old-preload)) + ad-do-it))) + +;;;-------------------------------------------------------------------------- ;;; MPC configuration. (eval-when-compile (trap (require 'mpc)))