X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/b7a7bc6406ce42725b56d0659af6d841920628a2..94e3dae355ff33f8d142f072577193c5c358df99:/dot/emacs diff --git a/dot/emacs b/dot/emacs index 729c6f7..8832f3f 100644 --- a/dot/emacs +++ b/dot/emacs @@ -23,6 +23,7 @@ (setq load-path (nconc load-path (list "~/lib/emacs"))) (require 'dot-emacs) +(require 'cl) ;;;-------------------------------------------------------------------------- ;;; Some random initialisation. @@ -62,7 +63,7 @@ (trap (or mdw-fast-startup (require 'tex-site))) -(trap (or mdw-fast-startup (semantic-load-enable-excessive-code-helpers))) +(trap (or mdw-fast-startup t (semantic-load-enable-code-helpers))) (setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/") (eval-after-load "senator" '(setq isearch-mode-hook @@ -141,6 +142,7 @@ (setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$" message-yank-prefix "> " message-yank-cited-prefix "> " + message-send-mail-function 'message-send-mail-with-sendmail message-indent-citation-function '(message-indent-citation mdw-trim-spaces-after-citing)) @@ -240,6 +242,9 @@ (setq ispell-program-name "aspell-hack" ispell-local-dictionary "en_GB-ize-w_accents" flyspell-default-dictionary "en_GB-ize-w_accents" + ispell-local-dictionary-alist + '(("en_GB-ize-w_accents" "[[:alpha:]]" "[^[:alpha:]]" "'" t + ("-d" "en_GB-ize-w_accents") nil utf-8)) ispell-silently-savep t) (trap (require 'uniquify) @@ -443,6 +448,7 @@ (global-set-key [?\C-x ?t ?s] 'timeclock-status-string) (global-set-key [?\C-x ?t ?p] 'nc-timesheet-prepare) (global-set-key [?\C-x ?t ?\C-m] 'nc-timesheet-submit) + (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally) (global-set-key [?\M-#] 'calc-dispatch) (global-set-key [?\C-x ?/] 'auto-fill-mode) (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window) @@ -480,6 +486,18 @@ (org-remember-insinuate) (global-set-key [?\C-c ?r] 'org-remember))) +;; Minor mode listing + +(setq minor-mode-alist + (mdw-uniquify-alist '((reveal-mode (hs-minor-mode + " hs/r" + (global-reveal-mode + "" " Reveal"))) + (hs-minor-mode (reveal-mode "" " hs")) + (abbrev-mode "") + (gtags-mode "")) + minor-mode-alist)) + ;; Recognising types of files. (setq auto-mode-alist @@ -584,8 +602,9 @@ (setq tramp-default-method "ssh") (setq tramp-default-method-alist `(("\\`\\(localhost\\|\\)\\'" "" - ,(cond ((executable-find "become") "become") - ((executable-find "really") "really") + ,(cond ((executable-find "really") "really") + ((executable-find "become") "become") + ((executable-find "sudo") "sudo") (t "su"))))))) ;;;-------------------------------------------------------------------------- @@ -773,7 +792,7 @@ (setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *") (setq comint-password-prompt-regexp (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)" - "[Pp]assword\\|pass phrase\\):") + "[Pp]assword\\|[Pp]ass ?phrase\\(\\| [-a-zA-Z0-9._]+\\)\\):") comint-file-name-chars "~/A-Za-z0-9+@:_.$#%,={}-" shell-file-name-chars comint-file-name-chars)