X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/02a961ceca4c4f94dec705a548ab95686d34629b..13c19c5dbc0c5a20a6916061df1a227bad914b54:/el/dot-emacs.el diff --git a/el/dot-emacs.el b/el/dot-emacs.el index 6930bda..a9e2d72 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. @@ -200,13 +209,16 @@ fringes is not taken out of the allowance for WIDTH, unlike ((>= width 0) (+ width (mdw-horizontal-window-overhead))) ((< width 0) width)))) +(defun mdw-preferred-column-width () + "Return the preferred column width." + (if (and window-system (mdw-emacs-version-p 22)) mdw-column-width + (1+ mdw-column-width))) + (defun mdw-divvy-window (&optional width) "Split a wide window into appropriate widths." (interactive "P") - (setq width (cond (width (prefix-numeric-value width)) - ((and window-system (mdw-emacs-version-p 22)) - mdw-column-width) - (t (1+ mdw-column-width)))) + (setq width (if width (prefix-numeric-value width) + (mdw-preferred-column-width))) (let* ((win (selected-window)) (sb-width (mdw-horizontal-window-overhead)) (c (/ (+ (window-width) sb-width) @@ -220,10 +232,8 @@ fringes is not taken out of the allowance for WIDTH, unlike (defun mdw-set-frame-width (columns &optional width) (interactive "nColumns: P") - (setq width (cond (width (prefix-numeric-value width)) - ((and window-system (mdw-emacs-version-p 22)) - mdw-column-width) - (t (1+ mdw-column-width)))) + (setq width (if width (prefix-numeric-value width) + (mdw-preferred-column-width))) (let ((sb-width (mdw-horizontal-window-overhead))) (set-frame-width (selected-frame) (- (* columns (+ width sb-width)) @@ -253,6 +263,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'. @@ -470,25 +481,52 @@ Evil key bindings are defined in `mdw-evil-keymap-keys'." (dolist (key replacements) (define-key keymap key binding)))))) -(eval-after-load "org-latex" - '(progn - (push '("strayman" - "\\documentclass{strayman} +(defvar mdw-org-latex-defs + '(("strayman" + "\\documentclass{strayman} \\usepackage[utf8]{inputenc} \\usepackage[palatino, helvetica, courier, maths=cmr]{mdwfonts} \\usepackage{graphicx, tikz, mdwtab, mdwmath, crypto, longtable}" - ("\\section{%s}" . "\\section*{%s}") - ("\\subsection{%s}" . "\\subsection*{%s}") - ("\\subsubsection{%s}" . "\\subsubsection*{%s}") - ("\\paragraph{%s}" . "\\paragraph*{%s}") - ("\\subparagraph{%s}" . "\\subparagraph*{%s}")) - org-export-latex-classes))) + ("\\section{%s}" . "\\section*{%s}") + ("\\subsection{%s}" . "\\subsection*{%s}") + ("\\subsubsection{%s}" . "\\subsubsection*{%s}") + ("\\paragraph{%s}" . "\\paragraph*{%s}") + ("\\subparagraph{%s}" . "\\subparagraph*{%s}")))) + +(eval-after-load "org-latex" + '(setq org-export-latex-classes + (append mdw-org-latex-defs org-export-latex-classes))) + +(eval-after-load "ox-latex" + '(setq org-latex-classes (append mdw-org-latex-defs org-latex-classes) + org-latex-default-packages-alist '(("AUTO" "inputenc" t) + ("T1" "fontenc" t) + ("" "fixltx2e" nil) + ("" "graphicx" t) + ("" "longtable" nil) + ("" "float" nil) + ("" "wrapfig" nil) + ("" "rotating" nil) + ("normalem" "ulem" t) + ("" "textcomp" t) + ("" "marvosym" t) + ("" "wasysym" t) + ("" "amssymb" t) + ("" "hyperref" nil) + "\\tolerance=1000"))) + (setq org-export-docbook-xslt-proc-command "xsltproc --output %o %s %i" org-export-docbook-xsl-fo-proc-command "fop %i.safe %o" org-export-docbook-xslt-stylesheet "/usr/share/xml/docbook/stylesheet/docbook-xsl/fo/docbook.xsl") +;; Glasses. + +(setq glasses-separator "-" + glasses-separate-parentheses-p nil + glasses-uncapitalize-p t) + ;; Some hacks to do with window placement. (defun mdw-clobber-other-windows-showing-buffer (buffer-or-name) @@ -497,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) @@ -549,7 +590,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)) @@ -731,6 +772,78 @@ Use this to arrange for per-server settings.") (eval-after-load "erc" '(load "~/.ercrc.el")) +;; Heavy-duty Gnus patching. + +(defun mdw-nnimap-transform-headers () + (goto-char (point-min)) + (let (article lines size string) + (block nil + (while (not (eobp)) + (while (not (looking-at "\\* [0-9]+ FETCH")) + (delete-region (point) (progn (forward-line 1) (point))) + (when (eobp) + (return))) + (goto-char (match-end 0)) + ;; Unfold quoted {number} strings. + (while (re-search-forward + "[^]][ (]{\\([0-9]+\\)}\r?\n" + (save-excursion + ;; Start of the header section. + (or (re-search-forward "] {[0-9]+}\r?\n" nil t) + ;; Start of the next FETCH. + (re-search-forward "\\* [0-9]+ FETCH" nil t) + (point-max))) + t) + (setq size (string-to-number (match-string 1))) + (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))) + ;; [mdw] missing from upstream + (backward-char 1)) + (beginning-of-line) + (setq article + (and (re-search-forward "UID \\([0-9]+\\)" (line-end-position) + t) + (match-string 1))) + (setq lines nil) + (setq size + (and (re-search-forward "RFC822.SIZE \\([0-9]+\\)" + (line-end-position) + t) + (match-string 1))) + (beginning-of-line) + (when (search-forward "BODYSTRUCTURE" (line-end-position) t) + (let ((structure (ignore-errors + (read (current-buffer))))) + (while (and (consp structure) + (not (atom (car structure)))) + (setq structure (car structure))) + (setq lines (if (and + (stringp (car structure)) + (equal (upcase (nth 0 structure)) "MESSAGE") + (equal (upcase (nth 1 structure)) "RFC822")) + (nth 9 structure) + (nth 7 structure))))) + (delete-region (line-beginning-position) (line-end-position)) + (insert (format "211 %s Article retrieved." article)) + (forward-line 1) + (when size + (insert (format "Chars: %s\n" size))) + (when lines + (insert (format "Lines: %s\n" lines))) + ;; Most servers have a blank line after the headers, but + ;; Davmail doesn't. + (unless (re-search-forward "^\r$\\|^)\r?$" nil t) + (goto-char (point-max))) + (delete-region (line-beginning-position) (line-end-position)) + (insert ".") + (forward-line 1))))) + +(eval-after-load 'nnimap + '(defalias 'nnimap-transform-headers + (symbol-function 'mdw-nnimap-transform-headers))) + ;;;-------------------------------------------------------------------------- ;;; Utility functions. @@ -798,7 +911,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)))))) @@ -863,6 +976,27 @@ tramp, which seems to get itself into a twist." (defadvice write-file (after mdw-autorevert activate) (mdw-check-autorevert)) +(defun mdw-auto-revert () + "Recheck all of the autorevertable buffers, and update VC modelines." + (interactive) + (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. @@ -896,6 +1030,12 @@ options." (concat (shell-quote-argument (dired-get-filename nil)) " " args))) +(defadvice dired-do-flagged-delete + (around mdw-delete-if-prefix-argument activate compile) + (let ((delete-by-moving-to-trash (and (null current-prefix-arg) + delete-by-moving-to-trash))) + ad-do-it)) + (eval-after-load "dired" '(define-key dired-mode-map "X" 'mdw-dired-run)) @@ -918,9 +1058,11 @@ If NEW-SESSION-P, start a new session." (w3m-browse-url url new-session-p)) (select-window window))))) +(eval-after-load 'w3m + '(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) @@ -1310,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)) @@ -1830,7 +1976,7 @@ name, as a symbol." (defvar mdw-c-comment-fill-prefix `((,(concat "\\([ \t]*/?\\)" - "\\(\*\\|//]\\)" + "\\(\\*\\|//\\)" "\\([ \t]*\\)" "\\([A-Za-z]+:[ \t]*\\)?" mdw-hanging-indents) @@ -1965,7 +2111,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 @@ -2001,7 +2147,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. @@ -2021,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. @@ -2066,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. @@ -2086,22 +2240,35 @@ name, as a symbol." (defun mdw-fontify-java () + ;; Fiddle with some syntax codes. + (modify-syntax-entry ?@ ".") + (modify-syntax-entry ?@ "." font-lock-syntax-table) + ;; Other stuff. (setq mdw-fill-prefix mdw-c-comment-fill-prefix) ;; Now define things to be fontified. (make-local-variable 'font-lock-keywords) (let ((java-keywords - (mdw-regexps "abstract" "boolean" "break" "byte" "case" "catch" - "char" "class" "const" "continue" "default" "do" - "double" "else" "extends" "final" "finally" "float" - "for" "goto" "if" "implements" "import" "instanceof" - "int" "interface" "long" "native" "new" "package" - "private" "protected" "public" "return" "short" - "static" "switch" "synchronized" "throw" "throws" - "transient" "try" "void" "volatile" "while")) - - (java-constants + (mdw-regexps "abstract" "assert" + "boolean" "break" "byte" + "case" "catch" "char" "class" "const" "continue" + "default" "do" "double" + "else" "enum" "extends" + "final" "finally" "float" "for" + "goto" + "if" "implements" "import" "instanceof" "int" + "interface" + "long" + "native" "new" + "package" "private" "protected" "public" + "return" + "short" "static" "strictfp" "switch" "synchronized" + "throw" "throws" "transient" "try" + "void" "volatile" + "while")) + + (java-builtins (mdw-regexps "false" "null" "super" "this" "true"))) (setq font-lock-keywords @@ -2111,8 +2278,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. @@ -2129,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. @@ -2154,11 +2325,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"))) @@ -2169,8 +2337,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. @@ -2187,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. @@ -2237,10 +2409,6 @@ name, as a symbol." "[lLfFdD]?") '(0 mdw-number-face)) - ;; Identifiers with trailing operators. - (list (concat "_\\(" punctuation "\\)+") - '(0 mdw-trivial-face)) - ;; And everything else is punctuation. (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face))) @@ -2260,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. @@ -2300,7 +2472,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 @@ -2310,8 +2482,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. @@ -2331,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. @@ -2450,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. @@ -2511,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. @@ -2525,26 +2707,28 @@ 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" - "false" "final" "fn" "for" + "final" "fn" "for" "if" "impl" "in" "let" "loop" "macro" "match" "mod" "move" "mut" "offsetof" "override" - "priv" "pub" "pure" + "priv" "proc" "pub" "pure" "ref" "return" - "self" "sizeof" "static" "struct" "super" - "true" "trait" "type" "typeof" - "unsafe" "unsized" "use" + "sizeof" "static" "struct" "super" + "trait" "try" "type" "typeof" + "union" "unsafe" "unsized" "use" "virtual" "where" "while" "yield")) @@ -2554,7 +2738,8 @@ name, as a symbol." "f32" "f64" "i8" "i16" "i32" "i64" "isize" "u8" "u16" "u32" "u64" "usize" - "char" "str"))) + "char" "str" + "self" "Self"))) (setq font-lock-keywords (list @@ -2576,7 +2761,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)) @@ -2588,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. @@ -2644,19 +2833,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. @@ -2721,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. @@ -2740,9 +2942,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. @@ -2776,10 +2978,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 () @@ -2819,15 +3026,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. @@ -2874,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. @@ -2882,22 +3097,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) @@ -3623,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. @@ -3673,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. @@ -3716,31 +4078,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) @@ -3764,9 +4102,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 () @@ -3797,20 +4145,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 () @@ -3822,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. @@ -3835,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. @@ -3896,13 +4311,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)) @@ -3912,7 +4327,7 @@ This allows you to pass a list of arguments through `ansi-term'." (ansi-term (list "ssh" host) (format "ssh@%s" host))) (defvar git-grep-command - "env PAGER=cat git grep --no-color -nH -e " + "env GIT_PAGER=cat git grep --no-color -nH -e " "*The default command for \\[git-grep].") (defvar git-grep-history nil) @@ -3922,12 +4337,13 @@ This allows you to pass a list of arguments through `ansi-term'." (interactive (list (read-shell-command "Run git grep (like this): " git-grep-command 'git-grep-history))) - (grep command-args)) + (let ((grep-use-null-device nil)) + (grep command-args))) ;;;-------------------------------------------------------------------------- ;;; 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 "" @@ -3939,6 +4355,7 @@ This allows you to pass a list of arguments through `ansi-term'." (magit-wip-after-apply-mode 1) (magit-wip-before-change-mode 1) (add-to-list 'magit-no-confirm 'safe-with-wip) + (add-to-list 'magit-no-confirm 'trash) (push '(:eval (if (or magit-wip-after-save-local-mode magit-wip-after-apply-mode magit-wip-before-change-mode) @@ -3957,6 +4374,13 @@ This allows you to pass a list of arguments through `ansi-term'." (around mdw-just-this-buffer activate compile) (let ((magit-save-repository-buffers nil)) ad-do-it)) +(defadvice magit-discard + (around mdw-delete-if-prefix-argument activate compile) + (let ((magit-delete-by-moving-to-trash + (and (null current-prefix-arg) + magit-delete-by-moving-to-trash))) + ad-do-it)) + (setq magit-repolist-columns '(("Name" 16 magit-repolist-column-ident nil) ("Version" 18 magit-repolist-column-version nil) @@ -3998,6 +4422,19 @@ there is sadness." (add-hook 'find-file-hook 'mdw-try-smerge t) ;;;-------------------------------------------------------------------------- +;;; GUD, and especially GDB. + +;; Inhibit window dedication. I mean, seriously, wtf? +(defadvice gdb-display-buffer (after mdw-undedicated (buf) compile activate) + "Don't make windows dedicated. Seriously." + (set-window-dedicated-p ad-return-value nil)) +(defadvice gdb-set-window-buffer + (after mdw-undedicated (name &optional ignore-dedicated window) + compile activate) + "Don't make windows dedicated. Seriously." + (set-window-dedicated-p (or window (selected-window)) nil)) + +;;;-------------------------------------------------------------------------- ;;; MPC configuration. (eval-when-compile (trap (require 'mpc)))