Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile:
  dot/emacs: More sophisticated setup of `load-path'.

diff --git a/dot/emacs b/dot/emacs
index 40280de..f1bcfbf 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -222,6 +222,8 @@
                                     "\\)")
                             addr)
               (concat "submit@bugs." (match-string 1 addr)))
+             ((string-match "^\\([^@+]+\\)\\+[^@]*\\(@.*\\)$" addr)
+              (concat (match-string 1 addr) (match-string 2 addr)))
              (t addr))))
 
 ;; Customization.
@@ -493,7 +495,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)
@@ -505,7 +508,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)))
@@ -551,7 +554,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 (file)
--- 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 (file)
--- 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 d254154..a1cba54 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1098,12 +1098,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)))