X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/dca9e3aed231e0c5b527c03e9c27d25250bfef87..c60cbbe8c902c3bd56a093e5479de4f7855e464f:/dot/emacs diff --git a/dot/emacs b/dot/emacs index d3c9251..faae519 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,8 +63,13 @@ (trap (or mdw-fast-startup (require 'tex-site))) -(trap (or mdw-fast-startup (semantic-load-enable-minimum-features))) +(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 + (remq 'senator-isearch-mode-hook isearch-mode-hook) + isearch-mode-end-hook + (remq 'senator-isearch-mode-hook isearch-mode-end-hook))) ;; Skeleton stuff. @@ -89,8 +95,15 @@ (and (or window-system (>= emacs-major-version 23)) (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$") + edit-server-new-frame nil gnuserv-frame t) - (trap (server-start)))) + (trap (server-start)) + (trap (progn + (require 'edit-server) + (edit-server-start) + (let ((edit (get-process "edit-server"))) + (and edit + (set-process-query-on-exit-flag edit nil))))))) ;; Control backup behaviour. @@ -114,10 +127,11 @@ ;; ---- Some mail and news configuration --- -(setq mail-from-style 'parens) -(setq mail-signature t) -(setq mail-yank-prefix "> ") -(setq mail-archive-file-name "~/Mail/sent") +(setq mail-from-style 'parens + mail-signature t + mail-yank-prefix "> " + mail-archive-file-name "~/Mail/sent" + compose-mail-user-agent-warnings nil) (setq rmail-display-summary t) (setq rmail-file-name "~/Mail/rmail") @@ -129,6 +143,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)) @@ -225,9 +240,12 @@ (setq password-cache-expiry nil) (setq-default proced-filter 'all proced-sort 'user) -(setq ispell-program-name "aspell" +(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) @@ -263,10 +281,19 @@ (setq url-cookie-untrusted-urls '(".")) (setq browse-url-browser-function (mdw-good-url-browser) + browse-url-generic-program "mdw-chrome" browse-url-mozilla-program "firefox") (setq w3m-default-display-inline-images t) +(eval-after-load "w3m" + '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil) + ("application/x-pdf" "\\.pdf\\'" ("evince" file) nil)))) + (dolist (e entries) + (setq w3m-content-type-alist + (cons e (remove* (car e) w3m-content-type-alist + :key #'car :test #'string=)))))) + (setq w3-do-incremental-display t w3-use-menus '(file edit view go bookmark options buffers style search emacs nil help) @@ -326,6 +353,9 @@ ;; Cosmetic stuff. +(setq calendar-view-diary-initially-flag t + calendar-view-holidays-initially-flag t) + (setq display-time-24hr-format t) (display-time) (column-number-mode 1) @@ -382,14 +412,12 @@ (cursor-color . "red")) (if mdw-black-background '((background-mode . dark)) - '((background-mode . light))) - (and (eq window-system 'x) - '((font . "6x13"))) - (and (eq window-system 'pm) - '((font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850") - (menu-font . "8.Helv") - (background-color . "lightgrey"))) - default-frame-alist)) + '((background-mode . light))))) +(setq window-system-default-frame-alist + '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850") + (menu-font . "8.Helv") + (background-color . "lightgrey")) + (nil (menu-bar-lines . 0)))) ;; Other frame fiddling. @@ -421,6 +449,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) @@ -458,6 +487,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 @@ -502,6 +543,13 @@ (setq completion-ignored-extensions (append `(".hc" ".hi") completion-ignored-extensions)) +(dolist (dir (remove-if-not (lambda (ext) + (= (aref ext (- (length ext) 1)) ?/)) + completion-ignored-extensions)) + (if (/= (aref dir 0) ?/) + (setq completion-ignored-extensions + (cons (concat "/" dir) + (remove dir completion-ignored-extensions))))) ;; Some common local definitions. @@ -553,11 +601,21 @@ (tramp-remote-sh "/bin/sh")) ,@tramp-methods))) (setq tramp-default-method "ssh") - (setq tramp-default-method-alist - `(("\\`\\(localhost\\|\\)\\'" "" - ,(cond ((executable-find "become") "become") - ((executable-find "really") "really") - (t "su"))))))) + (let ((rootlyness (cond ((executable-find "really") "really") + ((executable-find "become") "become") + ((executable-find "sudo") "sudo") + (t "su"))) + (this-host (concat "\\`\\(localhost\\|" + (system-name) "\\|\\)\\'")) + (this-user (concat "\\`\\(" (user-login-name) "\\|" + (user-real-login-name) "\\|\\)\\'"))) + (setq tramp-default-method-alist + `((,this-host nil ,rootlyness) + (nil ,this-user "ssh") + (nil "." ,rootlyness))) + (setq tramp-default-proxies-alist + `((,this-host nil nil) + (nil "." "/ssh:%h:")))))) ;;;-------------------------------------------------------------------------- ;;; General fontification. @@ -744,7 +802,9 @@ (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) ;; Notice passwords, and make C-a work right.