various updates.

git-svn-id: file:///svn/tfheen/trunk/dotfiles@128 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/gnus b/gnus
index fcdef41a574dfe1bf3b771effead71e16b9269db..88b65de4a4b34ffb918b28b54bbce580c641a3d5 100644 (file)
--- a/gnus
+++ b/gnus
@@ -24,7 +24,8 @@
 (cw/for-host "yiwaz\\|arabella"
   (setq gnus-select-method '(nntp "localhost")
         gnus-secondary-select-methods '((nnml "")))
-  (add-to-list 'gnus-secondary-select-methods '(nntp "news.hardware.no")))
+  (add-to-list 'gnus-secondary-select-methods '(nntp "news.hardware.no"))
+  )
 
 (cw/for-host "vawad"
   (setq gnus-select-method '(nntp "localhost")))
@@ -66,20 +67,22 @@ inserts \" characters."
 
 
 (setq nnmail-split-methods 
-      (list '("junk.2002" "^From:.*Cron")
+      (list '("junk.2003" "^From:.*Cron")
            '("spam" "^From:.*lifeminders.com")
            '("spam" "^From:.*@link2buy.com")
            '("spam" "^Subject: =\\?ks_c_5601-1987")
            '("spam" "^Subject:.*Boost Your Windows Reliability!")
            '("spam" "^Subject:.*Xsamplesampledesktopdesktopsamplesampledesktopsamplesamplesamplesamplesampledesktopsamplesamplesamplesampledesktopsamplesampledesktopdesktopsamplesamplesampledesktopsampledesktopdesktopdesktopdesktopdesktopsamplesampledesktopdesktopsampledesktopsampledesktadd.nodesktop")
            '("spam" "^From: spam_filter@linuxfreemail.com")
-           '("spam" "^Content-Type: text/html; charset=KS_C_5601-1987")
+           '("spam" "^Content-Type:.*charset=.*KS_C_5601-1987")
+            '("spam" "^Content-Type:.*charset=.*BIG5")
+            '("spam" "^Content-Type:.*charset=.*GB2312")
            '("spam" "^Subject:.*±¤°í")
             ; Hand-moderated lists over automatic spam detection
-           '("bugtraq.2002" "^Delivered-To:.*bugtraq@securityfocus.com")
+           '("bugtraq.2003" "^Delivered-To:.*bugtraq@securityfocus.com")
             '("maybe-spam" "^X-Spam-Status: Yes")
            '("infobeat" "^From:.*InfoBeat")
-           '("in-2002-news" "^Delivered-To:.*tollef-news")
+           '("in-2003-news" "^Delivered-To:.*tollef-news")
            '("www.zope.div" "^\\(To\\|Cc\\):.*zope@\\(zope\\|egroups.com\\)")
            '("drift.fagerborg" "^\\(To\\|Cc\\):.*drift@.*fagerborg")
            '("drift.fagerborg" "^\\(To\\|Cc\\):.*fa-drift")
@@ -116,18 +119,22 @@ inserts \" characters."
            '("drift.hardware.emergency" "^From:.*netsaint@.*hardware")
            '("drift.hardware.news" "^\\(To\\|Cc\\|Delivered-To\\):.*usenet@.*hardware.no")
            '("drift.hardware.drift" "^\\(To\\|Cc\\|Delivered-To\\):.*drift@hardware.no")
+            '("drift.hardware.firewall" "^\\(To\\|Cc\\|Delivered-To\\):.*firewall@webdeal.no")
+
            '("drift.samfundet.gsf" "^\\(To\\|Cc\\):.*gsf@.*\\(samfundet\\|stud\\)")
            '("drift.samfundet.gsk" "^\\(To\\|Cc\\):.*gsk@.*\\(samfundet\\|stud\\)")
             '("drift.isfit.it-admin" "Delivered-To:.*it-admin@isfit.org")
             '("drift.isfit.mail" "Subject: bayer.isfit.org Daily Mail Report")
             '("drift.isfit.logwatch" "Subject: LogWatch for bayer.isfit.org")
            '("drift.lis.drift" "^\\(To\\|Cc\\|Delivered-To\\):.*drift@sk[ou]lelinux.no")
-           '("drift.itk.rt" "^X-RT-Loop-Prevention: samfundet")
+           '("drift.itk.rt" "^X-RT-Loop-Prevention: \\(samfundet\\|itk\\)")
             '("drift.itk.arpwatch" "From:.*arpwatch@samfundet.no")
            '("drift.itk.kort" "^\\(To\\|Cc\\):.*kort@.*\\(samfundet\\|stud\\)")
            '("drift.itk.itk" "^\\(To\\|Cc\\):.*itk@.*\\(samfundet\\|stud\\)")
+           '("drift.itk.ethernity" "^\\(To\\|Cc\\):.*ethernity@.*\\(samfundet\\|stud\\)")
            '("drift.itk.sosialt" "^\\(To\\|Cc\\):.*itk-sosialt@.*\\(samfundet\\|stud\\)")
            '("drift.itk.intern" "^\\(To\\|Cc\\):.*itk-intern@.*\\(samfundet\\|stud\\)")
+           '("drift.itk.intern-intern" "^\\(To\\|Cc\\):.*itk-intern-intern@.*\\(samfundet\\|stud\\)")
            '("drift.itk.uka" "^\\(To\\|Cc\\):.*itk@.*uka")
            '("drift.itk.uka-itavd" "^\\(To\\|Cc\\):.*itavd@.*uka")
            '("drift.itk.unix" "^\\(To\\|Cc\\):.*unix@.*samfundet")
@@ -166,7 +173,7 @@ inserts \" characters."
            '("programmering.qt.snapshot" "^\\(To\\|Cc:\\).*snapshot-users@troll")
            '("div.hn" "^To:.*hn@coollist.com")
            '("div.hn" "^To:.*hw-intern")
-           '("div.linux-i-skolen" "^\\(To\\|Cc\\|Reply-To\\):.*linuxisk[ou]len")
+           '("div.linux-i-skolen" "^List-Id:.*linuxiskolen.skolelinux.no")
            '("linux.linux-i-skolen.info" "^List-Id:.*info.skolelinux.no")
            '("linux.linux-i-skolen.devel" "^List-Id:.*devel.skolelinux.no")
            '("div.registrar" "\\(To\\|Cc\\):.*registrar@norid.no")
@@ -174,40 +181,43 @@ inserts \" characters."
             '("div.geekski" "^List-Id.*geekski.hands.com")
            '("firma.ibm" "^To:.*techconnect")
            '("div.tipworld" "^To:.*tollef-tipworld")
+            '("freesoftware.europen-se" "^\\(To\\|Cc\\):.*europen-se@dkuug.dk")
             '("freesoftware.cofsino" "List-Id.*cofsino.lists.raw.no")
            '("freesoftware.nafs" "List-Id.*nafs.mail.nafs.org")
            '("freesoftware.cvs.info" "List-Id.*info-cvs.gnu.org")
            '("freesoftware.cvs.bug" "List-Id.*bug-cvs.gnu.org")
            '("freesoftware.efn.listen" "List-Id.*efn-listen.ifi.uio.no")
-           '("linux.spi.private.2002" "^List.*spi-private.lists.spi-inc.org")
+           '("linux.spi.private.2003" "^List.*spi-private.lists.spi-inc.org")
             '("linux.progeny.pgi-workers" "^List-Id.*pgi-workers.lists.progeny.com")
+            '("linux.progeny.discover-workers" "^List-Id.*discover-workers.lists.progeny.com")
             
            '("linux.debian.hurd-testdrive" "List-Id.*hurd-testdrive.moneybags.cs.uml.edu")
-           '("linux.debian.dwn.2002" "^Delivered-To.*dwn@debian.org")
-           '("linux.debian.cd.2002" "^X-Mailing-List.*debian-cd")
-           '("linux.debian.testing.2002" "^X-Mailing-List.*debian-testing")
-           '("linux.debian.www.2002" "^X-Mailing-List.*debian-www")
-           '("linux.debian.debbugs.2002" "^X-Mailing-List.*debian-debbugs")
-           '("linux.debian.laptop.2002" "^X-Mailing-List.*debian-laptop")
-           '("linux.debian.ctte.2002" "^X-Mailing-List.*debian-ctte")
-           '("linux.debian.devel-changes.2002" "^X-Mailing-List.*debian-devel-changes")
-           '("linux.debian.emacsen.2002" "^X-Mailing-List.*debian-emacsen")
-           '("linux.debian.policy.2002" "^X-Mailing-List.*debian-policy")
-           '("linux.debian.project.2002" "^X-Mailing-List.*debian-project")
-           '("linux.debian.python.2002" "^X-Mailing-List.*debian-python")
-           '("linux.debian.qa.2002" "^X-Mailing-List.*debian-qa")
-           '("linux.debian.bsd.2002" "^X-Mailing-List.*debian-bsd")
-           '("linux.debian.curiosa.2002" "^X-Mailing-List.*debian-curiosa")
-           '("linux.debian.www-cvs.2002" "^To.*joey-www-cvs@master.debian.org")
-           '("linux.debian.www-cvs.2002" "^To.*cvsdiff-english@www-master.debian.org")
-           '("linux.debian.java.2002" "^X-Mailing-List.*debian-java")
-           '("linux.debian.events-eu.2002" "^X-Mailing-List.*debian-events-eu")
-           '("linux.debian.boot.2002" "^X-Mailing-List.*debian-boot")
-           '("linux.debian.devel.2002" "^X-Mailing-List.*debian-devel")
-           '("linux.debian.private.2002" "^X-Mailing-List.*debian-private")
-           '("linux.debian.mentors.2002" "^X-Mailing-List.*debian-mentors")
-           '("linux.debian.vote.2002" "^X-Mailing-List.*debian-vote")
-           '("linux.debian.newmaint.2002" "^X-Mailing-List.*debian-newmaint")
+           '("linux.debian.dwn.2003" "^Delivered-To.*dwn@debian.org")
+           '("linux.debian.cd.2003" "^X-Mailing-List.*debian-cd")
+           '("linux.debian.testing.2003" "^X-Mailing-List.*debian-testing")
+           '("linux.debian.www.2003" "^X-Mailing-List.*debian-www")
+           '("linux.debian.debbugs.2003" "^X-Mailing-List.*debian-debbugs")
+           '("linux.debian.laptop.2003" "^X-Mailing-List.*debian-laptop")
+           '("linux.debian.ctte.2003" "^X-Mailing-List.*debian-ctte")
+           '("linux.debian.devel-changes.2003" "^X-Mailing-List.*debian-devel-changes")
+           '("linux.debian.emacsen.2003" "^X-Mailing-List.*debian-emacsen")
+           '("linux.debian.policy.2003" "^X-Mailing-List.*debian-policy")
+           '("linux.debian.project.2003" "^X-Mailing-List.*debian-project")
+           '("linux.debian.python.2003" "^X-Mailing-List.*debian-python")
+           '("linux.debian.qa.2003" "^X-Mailing-List.*debian-qa")
+           '("linux.debian.bsd.2003" "^X-Mailing-List.*debian-bsd")
+           '("linux.debian.curiosa.2003" "^X-Mailing-List.*debian-curiosa")
+           '("linux.debian.www-cvs.2003" "^To.*joey-www-cvs@master.debian.org")
+           '("linux.debian.www-cvs.2003" "^To.*cvsdiff-english@www-master.debian.org")
+           '("linux.debian.java.2003" "^X-Mailing-List.*debian-java")
+           '("linux.debian.events-eu.2003" "^X-Mailing-List.*debian-events-eu")
+           '("linux.debian.boot.2003" "^X-Mailing-List.*debian-boot")
+           '("linux.debian.boot-cvs.2003" "^Delivered-To: debian-installer_cvs@packages.qa.debian.org")
+           '("linux.debian.devel.2003" "^X-Mailing-List.*debian-devel")
+           '("linux.debian.private.2003" "^X-Mailing-List.*debian-private")
+           '("linux.debian.mentors.2003" "^X-Mailing-List.*debian-mentors")
+           '("linux.debian.vote.2003" "^X-Mailing-List.*debian-vote")
+           '("linux.debian.newmaint.2003" "^X-Mailing-List.*debian-newmaint")
            '("linux.debian.changes" "^X-Mailing-List.*debian-changes")
            '("linux.debian.news" "^X-Mailing-List.*debian-news")
            '("linux.debian.security" "^X-Mailing-List.*debian-security")
@@ -253,7 +263,7 @@ inserts \" characters."
           (format-time-string "nnml:out-%Y-%m"))))
 
 (cw/requiring-package (schizo)
-  (setq schizo-default-mail-from "tollef@add.no")
+  (setq schizo-default-mail-from "tfheen@raw.no")
   (setq schizo-default-news-from "tollef-news@add.no")
   (add-hook 'message-send-hook 'schizo-select)
   (setq schizo-select-list '(("t.f.heen@jus.uio.no"
@@ -416,7 +426,7 @@ inserts \" characters."
 
 (setq gnus-summary-gather-subject-limit 'fuzzy
       gnus-simplify-subject-fuzzy-regexp "^\\([Aa][Dd]: \\|[Ss][Vv]: \\|[Rr][Ee]: \\)+"
-      mc-gpg-comment "Please see my GPG key at http://www.opera.com/~tfheen/gpgkey.asc"
+      mc-gpg-comment "Please see my GPG key at http://raw.no/gpgkey.asc"
       gnus-simplify-ignored-prefixes "^\\([Aa][Dd]: \\|[Ss][Vv]: \\|[Rr][Ee]: \\)+"
       message-yank-prefix "| "
       message-citation-line-function 'tfh-insert-citation-line