X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ff190a3d7102c4704e06a9dba608b3278d52d687..c8d14c8c380ef2d7b691cacc47a3d3cce4d16bac:/dot/emacs diff --git a/dot/emacs b/dot/emacs index b2d9782..4107fda 100644 --- a/dot/emacs +++ b/dot/emacs @@ -33,8 +33,8 @@ (if (file-exists-p boot) (load boot)))) -(require 'dot-emacs) (require 'cl) +(require 'dot-emacs) ;;;-------------------------------------------------------------------------- ;;; Some random initialisation. @@ -134,6 +134,11 @@ (and edit (set-process-query-on-exit-flag edit nil))))))) +;; Saving state. + +(or mdw-fast-startup (savehist-mode 1)) +(setq history-length 200) + ;; Control backup behaviour. (setq backup-by-copying nil) @@ -172,6 +177,8 @@ send-mail-function 'sendmail-send-it mail-interactive t sendmail-error-reporting-interactive '("-odb" "-oee")) +(autoload 'sendmail-send-it "sendmail") +(autoload 'smtpmail-send-it "smtpmail") (setq mail-user-agent 'message-user-agent read-mail-command 'gnus) @@ -206,13 +213,17 @@ (lambda () (let ((group gnus-newsgroup-name)) (and (string-match "^nn\\(imap\\|folder\\)\\+" group) - (not (string-match ":\\(crap\\|spam\\|lists\\)\\." group))))) + (not (string-match ":\\(crap\\|spam\\|lists\\|corpus\\)\\." + group))))) bbdb-user-mail-names (concat "^" "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)" "\\([-+][^@]*\\|\\)" "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)" - "\\|" "\\(mdw\\(\\+[^@]*\\)?\\|0mdwk\\.[^@]*\\)" "@" + "\\|" "\\(" "\\(mdw\\|mwooding\\)" + "\\(\\+[^@]*\\)?" + "\\|" "0" "\\(mdw\\|mwooding\\)" "k\\.[^@]*" + "\\)" "@" "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk" "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com" "\\|" "mwooding@\\(good\\|blackberry\\)\\.com" @@ -307,7 +318,7 @@ (setq read-quoted-char-radix 16) ;C-q HEX-STUFF [RET] (setq case-fold-file-names nil) ;Don't translate file names (grr...) (setq scroll-step 5) ;Don't scroll too much at a time -(setq-default fill-column 77) ;I use rather narrow windows +(setq-default fill-column mdw-text-width) ;I use rather narrow windows (setq-default comment-column 40) ;Set a standard comment column (setq-default truncate-partial-width-windows nil truncate-lines t) @@ -315,7 +326,7 @@ (setq view-read-only t) (setq whitespace-style '(trailing empty indentation face lines-tail space-before-tab space-after-tab) - whitespace-line-column 77) + whitespace-line-column mdw-text-width) (setq woman-use-own-frame nil ;Keep man pages somewhere sensible woman-fill-column 72) ;Right margin position. (setq diff-switches "-u" ;I like reading unified diffs @@ -325,6 +336,7 @@ (setq find-ls-option ;Build file lists efficiently '("-print0 | xargs -0r ls -ld" . "ld")) (setq bookmark-save-flag 0) ;Save bookmarks automatically +(setq vc-follow-symlinks t) (setq x-gtk-file-dialog-help-text nil) (setq Info-fontify-maximum-menu-size 100000) (setq set-mark-command-repeat-pop t) @@ -393,8 +405,8 @@ w3m-use-cookies t) (eval-after-load "w3m" - '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil) - ("application/x-pdf" "\\.pdf\\'" ("evince" file) nil)))) + '(let ((entries '(("application/pdf" "\\.pdf\\'" ("xdg-open" file) nil) + ("application/x-pdf" "\\.pdf\\'" ("xdg-open" file) nil)))) (dolist (e entries) (setq w3m-content-type-alist (cons e (remove* (car e) w3m-content-type-alist @@ -528,7 +540,8 @@ (setq frame-background-mode (if mdw-black-background 'dark 'light) default-frame-alist - `((width . ,(if (>= emacs-major-version 21) 77 78)) + `((width . ,(+ mdw-column-width + (if (>= emacs-major-version 21) 0 1))) (height . 33) (vertical-scroll-bars . right) (cursor-type . bar) @@ -541,7 +554,8 @@ (cursor-color . "red") (background-mode . ,frame-background-mode)) initial-frame-alist - `((width . ,(if (>= emacs-major-version 21) 77 78)) + `((width . ,(+ mdw-column-width + (if (>= emacs-major-version 21) 0 1))) (menu-bar-lines . ,(if window-system 1 0))) window-system-default-frame-alist '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850") @@ -585,6 +599,7 @@ (global-set-key [?\C-c ?t ?r] 'timeclock-reread-log) (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string) (global-set-key [?\C-c ?t ?s] 'timeclock-status-string) + (global-set-key [?\C-c ?k] 'compile) (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally) (global-set-key [?\M-#] 'calc-dispatch) (global-set-key [?\C-x ?/] 'auto-fill-mode) @@ -608,7 +623,14 @@ (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point) (global-set-key [f11] 'mdw-toggle-full-screen) (and (not mdw-fast-startup) (fboundp 'hippie-expand) - (global-set-key [?\M-/] 'hippie-expand))) + (global-set-key [?\M-?] 'hippie-expand))) + +(eval-after-load "hippie-exp" + '(setq hippie-expand-try-functions-list + (remove-if (lambda (name) + (memq name '(try-expand-list + try-expand-list-all-buffers))) + hippie-expand-try-functions-list))) (eval-after-load "dired" '(progn @@ -812,6 +834,7 @@ (progn (setq-default py-indent-offset 2 python-indent 2 + python-indent-offset 2 py-python-command-args `("-i" "-colors" ,(if mdw-black-background "Linux" "LightBG"))) @@ -876,9 +899,9 @@ (setq TeX-output-view-style '(("^dvi$" ("^landscape$" "^pstricks$\\|^pst-\\|^psfrag$") - "%(o?)dvips -t landscape %d -o && evince %f") + "%(o?)dvips -t landscape %d -o && xdg-open %f") ("^dvi$" "^pstricks$\\|^pst-\\|^psfrag$" - "%(o?)dvips %d -o && evince %f") + "%(o?)dvips %d -o && xdg-open %f") ("^dvi$" ("^a4\\(?:dutch\\|paper\\|wide\\)\\|sem-a4$" "^landscape$") "%(o?)xdvi %dS -paper a4r -s 0 %d") @@ -893,14 +916,17 @@ ("^dvi$" "^legalpaper$" "%(o?)xdvi %dS -paper legal %d") ("^dvi$" "^executivepaper$" "%(o?)xdvi %dS -paper 7.25x10.5in %d") ("^dvi$" "." "%(o?)xdvi %dS %d") - ("^pdf$" "." "evince %o") - ("^html?$" "." "netscape %o"))) + ("^pdf$" "." "xdg-open %o") + ("^html?$" "." "sensible-browser %o"))) + +(setq TeX-view-program-list + '(("mupdf" "mupdf %o" (mode-io-correlate " %(outpage)")))) (setq TeX-view-program-selection '(((output-dvi style-pstricks) "dvips and gv") (output-dvi "xdvi") - (output-pdf "Evince") - (output-html "xdg-open"))) + (output-pdf "mupdf") + (output-html "sensible-browser"))) (setq TeX-open-quote "\"" TeX-close-quote "\"")