X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ed5e20a5246bc228ede6b5951c34f8e89a8446d7..61d632068158706b1c3740f0c0a5a8e27244602d:/dot/emacs diff --git a/dot/emacs b/dot/emacs index ab9a94f..80f0cb5 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 @@ -94,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. @@ -119,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 'angles + 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") @@ -134,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)) @@ -230,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) @@ -340,13 +353,13 @@ ;; 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) -(trap - (if window-system - (let ((view-diary-entries-initially t)) - (calendar)))) +(trap (if window-system (calendar))) ;;;-------------------------------------------------------------------------- ;;; MailCrypt. @@ -433,6 +446,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) @@ -466,9 +480,21 @@ (add-hook 'org-agenda-mode-hook #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map))) (or mdw-fast-startup - (progn - (org-remember-insinuate) - (global-set-key [?\C-c ?r] 'org-remember))) + (trap (progn + (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. @@ -530,7 +556,7 @@ '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook csharp-mode-hook perl-mode-hook cperl-mode-hook python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook - tcl-mode-hook go-mode-hook + tcl-mode-hook go-mode-hook js-mode-hook asm-mode-hook TeX-mode-hook LaTeX-mode-hook TeXinfo-mode-hook tex-mode-hook latex-mode-hook texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook @@ -572,11 +598,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. @@ -607,6 +643,7 @@ (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t) (add-hook 'java-mode-hook 'mdw-fontify-java t) + (add-hook 'js-mode-hook 'mdw-fontify-javascript t) (add-hook 'csharp-mode-hook 'mdw-fontify-csharp t) (add-hook 'awk-mode-hook 'mdw-fontify-awk t) @@ -763,7 +800,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.