From: Mark Wooding Date: Thu, 14 Apr 2016 13:00:09 +0000 (+0100) Subject: Merge branch 'master' of https://git.distorted.org.uk/~mdw/profile X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/b76d1b814f813f9d5e692e002b1c8f644b79bc14?hp=d54a4cf35d90fe372d5b192ccd93bbd65ff4f25f Merge branch 'master' of https://git.distorted.org.uk/~mdw/profile * 'master' of https://git.distorted.org.uk/~mdw/profile: dot/emacs (bbdb-canonicalize-net-hook): Ignore a personal address scheme. dot/emacs (bbdb-canonicalize-net-hook): Ignore uninteresting addresses. dot/emacs (bbdb-canonicalize-net-hook): Handle `nil' address. dot/emacs: Don't auto-snarf email addresses from mailing lists. dot/emacs: Squash away `blah+...@some.domain' suffixes for BBDB. dot/gnus-local.el.distorted: Now I have my own newscookie. dot/screenrc: Add tracking of activity in other windows. el/dot-emacs.el: More assertive zapping of faces. dot/emacs: Set `frame-background-mode' variable. dot/emacs: Move `C-x w d' to `C-c w d'. --- diff --git a/dot/emacs b/dot/emacs index 48053fe..c32d836 100644 --- a/dot/emacs +++ b/dot/emacs @@ -201,7 +201,7 @@ (lambda () (let ((group gnus-newsgroup-name)) (and (string-match "^nnimap\\+" group) - (not (string-match ":\\(crap\\|spam\\)\\." group))))) + (not (string-match ":\\(crap\\|spam\\|lists\\)\\." group))))) bbdb-user-mail-names (concat "^" "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)" @@ -213,17 +213,24 @@ "\\)$") bbdb-canonicalize-net-hook (lambda (addr) - (cond ((string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_" - "HTML-[0-9]+-[0-9]+-[0-9]+" - "@\\(nationwide-communications\\.co\\.uk\\)") - addr) - (concat "nationwide@" (match-string 1 addr))) - ((string-match (concat "^[0-9]+@bugs\\." - "\\(" "debian\\.org" - "\\|" "distorted\\.org\\.uk" - "\\)") - addr) - (concat "submit@bugs." (match-string 1 addr))) + (cond ((null addr) + nil) + ((or (string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_" + "HTML-[0-9]+-[0-9]+-[0-9]+" + "@\\(nationwide-communications\\." + "co\\.uk\\)$") + addr) + (string-match (concat "^[0-9]+@bugs\\." + "\\(" "debian\\.org" + "\\|" "distorted\\.org\\.uk" + "\\)$") + addr) + (and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr) + (string= (md5 (match-string 2 addr)) + "879b795aed959b1a000e9f95c132b16c"))) + nil) + ((string-match "^\\([^@+]+\\)\\+[^@]*\\(@.*\\)$" addr) + (concat (match-string 1 addr) (match-string 2 addr))) (t addr)))) ;; Customization. @@ -495,7 +502,8 @@ ;; Default frame size. -(setq default-frame-alist +(setq frame-background-mode (if mdw-black-background 'dark 'light) + default-frame-alist `((width . ,(if (>= emacs-major-version 21) 77 78)) (height . 33) (vertical-scroll-bars . right) @@ -507,7 +515,7 @@ (tool-bar-lines . 0) (menu-bar-lines . 1) (cursor-color . "red") - (background-mode . ,(if mdw-black-background 'dark 'light))) + (background-mode . ,frame-background-mode)) initial-frame-alist `((width . ,(if (>= emacs-major-version 21) 77 78)) (menu-bar-lines . ,(if window-system 1 0))) @@ -553,7 +561,7 @@ (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) + (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window) (global-set-key [insertchar] 'overwrite-mode) (global-set-key [?\C-x ?\C-n] 'skel-create-file) (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window) diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted index 64dced6..ed32911 100644 --- a/dot/gnus-local.el.distorted +++ b/dot/gnus-local.el.distorted @@ -24,8 +24,8 @@ (setq gnus-select-method '(nntp "chiark-ssh-kludge" (nntp-open-connection-function nntp-open-authinfo-kludge) - (nntp-address "localhost:10119") - (nntp-authinfo-generic "md5cookie1way chiark"))) + (nntp-address "tunnel.chiark.greenend.org.uk") + (nntp-authinfo-generic "md5cookie1way mdw"))) ;;;-------------------------------------------------------------------------- ;;; Where we get mail from. diff --git a/dot/screenrc b/dot/screenrc index 2ff9317..c4e7792 100644 --- a/dot/screenrc +++ b/dot/screenrc @@ -11,6 +11,12 @@ vbell off ## Maintain a decent amount of scrool. defscrollback 1000 +## Snooping. +defmonitor on +defsilence on +activity "" +bell_msg "" + ## Do alternate-screen switching as requested. (Screen always uses its ## host's alternate-screen switching unless nobbled.) altscreen on @@ -38,7 +44,10 @@ startup_message off ## Caption and status lines. shelltitle ]|bash: caption splitonly "%{=br Cb}%?%F%{Yr}%?%3n %t%=%? [%h]%?" -hardstatus alwayslastline "%{=r Cb}%-Lw%{+b Y}%n%F %t%{-}%+Lw%=%H %Y-%m-%d %c:%s" +hardstatus alwayslastline "%{= bC}%-Lw%{+b .Y}%n %t%{-}%+Lw%=%?%E* %?%?%P[] %?%H %Y-%m-%d %c:%s" +rendition monitor + .R +rendition bell +b .R +rendition silence + .g ## Arrange for windows whose processes fail to hang around so I can see what ## happened to them. The manual says I should use `defzombie' here, but diff --git a/el/dot-emacs.el b/el/dot-emacs.el index fae5e01..dd8dc2f 100644 --- a/el/dot-emacs.el +++ b/el/dot-emacs.el @@ -1124,12 +1124,14 @@ doesn't match any of the regular expressions in ;;;-------------------------------------------------------------------------- ;;; General fontification. +(make-face 'mdw-virgin-face) + (defmacro mdw-define-face (name &rest body) "Define a face, and make sure it's actually set as the definition." (declare (indent 1) (debug 0)) `(progn - (make-face ',name) + (copy-face 'mdw-virgin-face ',name) (defvar ,name ',name) (put ',name 'face-defface-spec ',body) (face-spec-set ',name ',body nil)))