X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/d2d1d5dcee101bfbc96a6240f5f9af1df9ee652f..daeece4beeba2316d11910130f4476cb9ac8efb2:/el/dot-emacs.el diff --git a/el/dot-emacs.el b/el/dot-emacs.el index d99134d..fbc3899 100644 --- a/el/dot-emacs.el +++ b/el/dot-emacs.el @@ -200,13 +200,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 +223,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)) @@ -510,6 +511,12 @@ Evil key bindings are defined in `mdw-evil-keymap-keys'." 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) @@ -956,6 +963,12 @@ 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))) + ;;;-------------------------------------------------------------------------- ;;; Dired hacking. @@ -989,6 +1002,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)) @@ -1011,6 +1030,9 @@ 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 @@ -1923,7 +1945,7 @@ name, as a symbol." (defvar mdw-c-comment-fill-prefix `((,(concat "\\([ \t]*/?\\)" - "\\(\*\\|//]\\)" + "\\(\\*\\|//\\)" "\\([ \t]*\\)" "\\([A-Za-z]+:[ \t]*\\)?" mdw-hanging-indents) @@ -2330,10 +2352,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))) @@ -2628,15 +2646,15 @@ name, as a symbol." "const" "continue" "create" "do" "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" + "sizeof" "static" "struct" "super" + "trait" "type" "typeof" "unsafe" "unsized" "use" "virtual" "where" "while" @@ -2647,7 +2665,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 @@ -3448,6 +3467,8 @@ strip numbers instead." (list "[$^_{}#&]" '(0 mdw-punct-face))))) +(setq TeX-install-font-lock 'tex-font-setup) + (eval-after-load 'font-latex '(defun font-latex-jit-lock-force-redisplay (buf start end) "Compatibility for Emacsen not offering `jit-lock-force-redisplay'." @@ -4005,7 +4026,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) @@ -4015,7 +4036,8 @@ 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. @@ -4032,6 +4054,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) @@ -4050,6 +4073,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) @@ -4091,6 +4121,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)))