many fixes from dounreay

diff --git a/files/emacs_ian-aliases.el b/files/emacs_ian-aliases.el
index a61b6f643316ddde6b02f5aeb22d3ff2f8ebcac0..ff6e330763a5fc1977a0c4c56c71e175edaa6ded 100644 (file)
--- a/files/emacs_ian-aliases.el
+++ b/files/emacs_ian-aliases.el
@@ -1,134 +1,5 @@
 ;;    Ian Jackson's mail nicknames file.    -*- fundamental -*-
 ;;                                         (don't edit as elisp)
-(setq mail-aliases '(
-;;    Cambridge
-  ("adamm".             "Adam Mosley <ajm1006@cus.cam.ac.uk>")
-  ("alanb".            "Alan Bain <afrb2@hermes.cam.ac.uk>")
-  ("alanw".            "Alan Woolway <arw19@cus.cam.ac.uk>")
-  ("aldabras".         "Aldabra Stoddart <pas14@cus.cam.ac.uk>")
-  ("alicej".           "Alice Jenkins <AJ111@phx.cam.ac.uk>")
-  ("andersc".           "Anders Chrigstrom <ac@netg.se>")
-  ("andrewm".           "Andrew Mobbs <ajm46@hermes.cam.ac.uk>")
-  ("andyh".             "Andy Hopper <ah@cam-orl.co.uk>")
-  ("austind-urgent".    "Austin Donnelly <and1000@cl.cam.ac.uk>")
-  ("austind".           "Austin Donnelly <and1000@hermes.cam.ac.uk>")
-  ("austind-debian".    "Austin Donnelly <and1000@debian.org>")
-  ("austind-stable".    "Austin Donnelly <and1000@nyx.cs.du.edu>")
-  ("austind-home"  .    "Austin Donnelly <austin@greenend.org.uk>")
-  ("bdale".             "Bdale Garbee <bdale@gag.com>")
-  ("bdaleg".            "Bdale Garbee <bdale@gag.com>")
-  ("brucep".            "Bruce Perens <bruce@pixar.com>")
-  ("carls".             "Carl V Streeter <streeter@cae.wisc.edu>")
-  ("clarei".           "Clare Izard <clare@angelos.demon.co.uk>")
-  ("clivej".           "Clive Jones <clive@nsict.org>")
-  ("colinb".           "Colin Bell <crb11@cam.ac.uk>")
-  ("cucs".             "C.U. Computer Society <soc-cucs-request@lists.cam.ac.uk>")
-  ("cusfs".            "C.U. Science Fiction Society <CUSFS@phx.cam.ac.uk>")
-  ("dannyt".           "Daniel Luhde-Thompson <dannylt@chiark.greenend.org.uk>")
-  ("dans".              "Dan Sheppard <dps1001@cl.cam.ac.uk>")
-  ("daveh".            "Dave Holland <93djh2@eng.cam.ac.uk>")
-  ("davew".            "Dave Walker <dwalker@art.acorn.co.uk>")
-  ("davidd".           "David Damerell <damerell@chiark.greenend.org.uk>")
-  ("dianag".           "Diana Galletly <93dag@eng.cam.ac.uk>")
-  ("duncanm".          "Duncan MacGregor <dmm20@hermes.cam.ac.uk>")
-  ("garethm".          "Gareth McCaughan <gjm11@pmms.cam.ac.uk>")
-  ("garethr".          "Gareth Rees <gdr11@cl.cam.ac.uk>")
-  ("geraintp".          "Geraint Price <gp200@cl.cam.ac.uk>")
-  ("grayg".             "Gray Girling <cgg@cam-orl.co.uk>")
-  ("guym".              "Guy Maor <maor@ece.utexas.edu>")
-  ("helens".           "Helen Steele <h.steele@elsevier.co.uk>")
- ; was via relay.surfnet.nl
-  ("huww".              "Huw Walters <hwalters@madge.com>")
-  ("ianm".             "Ian Murdock <imurdock@debian.org>")
-  ("imurdock".         "Ian Murdock <imurdock@debian.org>")
-  ("inekej".           "Ineke Jackson <I.JACKSON@tasc.ac.uk>")
-  ("jamesb".           "James Briginshaw <jab24@damtp.cam.ac.uk>")
-  ("johnl".            "John Line <jml4@cus.cam.ac.uk>")
-  ("jonp".             "Jon Peatfield <J.S.Peatfield@damtp.cam.ac.uk>")
-  ("jonr".             "Jon Rabone <93jkr@eng.cam.ac.uk>")
-  ("karle".            "Karl Ewald <ewald@informatik.tu-muenchen.de>")
-  ("kat".              "Kate Harris <n.harris@ic.ac.uk>")
-  ("lizk".             "Liz Keogh <ee4emk@bath.ac.uk>")
-  ("lnrb".             "Eleanor Blair <hert0145@sable.ox.ac.uk>")
-  ("marisal".           "Marisa Lohr <ml10003@cus.cam.ac.uk>")
-  ("markc".             "Mark Carroll <mark@chaos.taylored.com>")
-  ("markl".             "Mark Lomas <tmal@cl.cam.ac.uk>")
-  ("markm".            "Mark Mackey <mdm1004@cus.cam.ac.uk>")
-  ("markw".            "Mark Wainwright <mark@expert.demon.co.uk>")
-  ("martinh".          "Martin Hardcastle <M.Hardcastle@bristol.ac.uk>")
-  ("martynj".          "Martyn Johnson <maj@cl.cam.ac.uk>")
-  ("neilt".            "Neil Turton <ndt1001@cus.cam.ac.uk>")
-  ("nigelh".           "Nigel Harris <njh27@hermes.cam.ac.uk>")
-  ("nikhiln".           "Nikhil Nair <nn201@cus.cam.ac.uk>")
-  ("owend".            "Owen Dunn <owend@chiark.greenend.org.uk>")
-  ("owenl".             "Owen Lyne <odl@maths.bath.ac.uk>")
-  ("douglasr".          "Douglas Reay <pallando@gold.net>")
-  ("paulm".            "Paul Menage <pbm1001@hermes.cam.ac.uk>")
-  ("peted".            "Pete Delpi <p.delpy@mail.cryst.bbk.ac.uk>")
-  ("peterb".           "Peter Benie <peterb@chiark.greenend.org.uk>")
-("phila". "Philip Abel </G=Philip/S=Abel/PRMD=KPMG/ADMD=MARK400/C=GB/@mhs-relay.ac.uk>")
-  ("richardb".         "Richard Black <rjb17@cl.cam.ac.uk>")
-  ("richardk".         "Richard Kettlewell <richard@elmail.co.uk>")
-  ("sfere".            "Richard Kettlewell <richard@sfere.elmail.co.uk>")
-  ("simons".           "Simon Shapiro <shimon@i-connect.net>")
-  ("rogern".           "Roger Needham <rmn@cl.cam.ac.uk>")
-  ("rossa".            "Ross Anderson <rja14@cl.cam.ac.uk>")
-  ("siona".            "Sion Arrowsmith <sa@bast.demon.co.uk>")
-  ("steved".           "Steve Davis <scd12@hermes.cam.ac.uk>")
-  ("stevee".           "Steve Early <stevee@chiark.greenend.org.uk>")
-  ("stevem".           "Steve McIntyre <stevem@chiark.greenend.org.uk>")
-  ("timc".             "Tim Cutts <tjrc1@cus.cam.ac.uk>")
-  ("timm".             "Tim Morley <tim@cityscape.co.uk>")
-  ("timr".             "Tim Roddis <troddis@applied-risc-tech.co.uk>")
-  ("tonyc".            "Tony Cains <atsab@csv.warwick.ac.uk>")
-  ("traceyc".          "Tracey Cool <tc108@cus.cam.ac.uk>")
-
-;;    Offsite misc
-  ("ankej".            "Anke Jackson <Anke.Jackson@newcastle.ac.uk>")
-  ("nickj".            "Nick Jackson <nj@hemmel.demon.co.uk>")
-  ("irw".              "Ian Woollard <irw@stl.stc.co.uk>")
-  ("mathew".           "mathew <mathew@mantis.co.uk>")
-
-;;    Linux
-  ("mattwelsh".                "Matt Welsh <mdw@sunsite.unc.edu>")
-  ("linustorvalds".    "Linus Torvalds <torvalds@cs.helsinki.fi>")
-  ("linus".            "Linus Torvalds <torvalds@cs.helsinki.fi>")
-  ("larswirzenius".    "Lars Wirzenius <wirzeniu@cc.helsinki.fi>")
-  ("danielquinlan".    "Daniel Quinlan <quinlan@spectrum.cs.bucknell.edu>")
-  ("ianmurdock".       "Ian Murdock <imurdock@debian.org>")
-  ("rikfaith".         "Rick Faith <faith@cs.unc.edu>")
-  ("ericyoungdale".    "Eric Youngdale <ericy@cais.com>")
-  ("eriktroan".                "Erik Troan <ewt@sunsite.unc.edu>")
-
-;;    Mailing lists
-  ("linux-fsstnd".     "Linux Filesystem Standard list <linux-fsstnd@ucsd.edu>")
-  ("fhs-discuss".      "Linux Filesystem Standard list <fhs-discuss@ucsd.edu>")
-  ("linux-core".       "Small FSSTND list <fsstnd@bucknell.edu>")
-  ("linux-security".    "Linux Security list <linux-security@tarsier.cv.nrao.edu>")
-  ("debian-alpha".     "Debian Alpha port list <debian-alpha@pixar.com>")
-  ("debian-sparc".     "Debian Sparc port list <debian-sparc@pixar.com>")
-  ("debian-user".      "Debian users list <debian-user@lists.debian.org>")
-  ("debian-bugs".      "Debian bugs submission address <submit@bugs.debian.org>")
-  ("debian-bugs-quiet". "Debian bugs quiet submissions <quiet@bugs.debian.org>")
-  ("debian-bugs-maintonly". "Debian bugs maintainer-only <maintonly@bugs.debian.org>")
-  ("debian-bugs-request". "Debian bugs mailserver <request@bugs.debian.org>")
-  ("debian-bugs-control". "Debian bugs control server <control@bugs.debian.org>")
-  ("debian-dpkg".      "Debian dpkg list <debian-dpkg@lists.debian.org>")
-  ("debian-devel".     "Debian developers list <debian-devel@lists.debian.org>")
-  ("debian-changes".   "Debian package announcements <debian-changes@lists.debian.org>")
-  ("debian-private".   "Debian private list <debian-private@lists.debian.org>")
-  ("debian-team".      "Debian core team list <debian-team@lists.debian.org>")
-  ("linuxdoc-sgml".    "Linuxdoc-SGML mailing list <linuxdoc-sgml@via.ecp.fr>")
-  ("faq-maintainers".  "FAQ maintainers list <faq-maintainers@mit.edu>")
-  ("doom-editing".      "DOOM editing mailing list <doom-editing@nvg.unit.no>")
-
-;;    Myself
-  ("myself".   "Ian Jackson <iwj@cam-orl.co.uk>")
-  ("chiark".   "Ian Jackson <iwj10@cus.cam.ac.uk>")
-  ("thor".     "Ian Jackson <iwj10@thor.cam.ac.uk>")
-  ("cam-orl".  "Ian Jackson <iwj@cam-orl.co.uk>")
-
-  ))
 
 ;; Address translations for PGP
 (setq autopgp-outgoing-address-translation-alist '(

diff --git a/files/emacs_ian.el b/files/emacs_ian.el
index 2ef9fe8d4065f65cc0d0e58fad42db5c1527bd68..eabf5ec9ee5b11cdf6d0bf814c55454eace746b0 100644 (file)
--- a/files/emacs_ian.el
+++ b/files/emacs_ian.el
@@ -374,7 +374,7 @@ then call send-and-exit."
 (add-hook 'vm-mode-hook
           '(lambda ()
              (local-set-key "Q" 'vm-quit)
-             (local-set-key "q" "#Q")))
+             (local-set-key "q" "###Q")))
 (add-hook 'mail-mode-hook
           '(lambda ()
              (if (and (boundp 'folder-buffer)
@@ -389,10 +389,6 @@ then call send-and-exit."
                    (setq mail-archive-file-name
                          "~/mail/SOutbound")))))
 ;
-(defun vmi ()
-  (interactive)
-  (vm "/u/ijackson/mail/INBOX"))
-;
 (defun vms ()
   (interactive)
   (vm vm-sysadmin-inbox))

diff --git a/files/emacs_ijackson.el b/files/emacs_ijackson.el
deleted file mode 100644 (file)
index 9188975..0000000
--- a/files/emacs_ijackson.el
+++ /dev/null
@@ -1,10 +0,0 @@
-(setq vm-primary-inbox (concat vm-folder-directory "INBOX")
-      vm-uninteresting-senders "ian"
-      vm-spool-files '("~/mbox" "~/mail/Outbound" "~/mail/Record" "~/mail/Import"
-                       "~/mail/inbox" "/var/spool/mail/ijackson" "~/News/r")
-      vm-reply-ignored-addresses
-      (make-regexps-ignore-non-address
-       '("ijackson@chiark.chu.cam.ac.uk" "ijackson"
-         "iwj10@thor.cam.ac.uk" "iwj10@hermes.cam.ac.uk" "iwj10@cl.cam.ac.uk"
-         "iwj10@cam.ac.uk" "Ian.Jackson@cl.cam.ac.uk"))
-      mail-archive-file-name "~/mail/Outbound")