Merge branch 'master' of ssh://gendo/home/manu/public_git/kolter-dotfiles

.mailfilter

@@ -18,9 +18,9 @@ if (/^X-BeenThere:\s*(.*)@rmll\.info/)
         to $MAILDIR/.rmll.09.$MATCH1
     }
 }
-if (/^From:.*reservation@rmll\.info/)
+if (/^From:.*reservation@rmll\.info/ || /^From:.*tpeweb@paybox\.com/)
 {
-    to $MAILDIR/.rmll.09.resa
+    to $MAILDIR/.rmll.resa
 }
 
 ### RMLL lists - 2010
@@ -62,7 +62,7 @@ if (/^List-Id:.*<backports-users\.lists\.backports\.org>/)
 }
 
 ### Debian France Lists
-if (/^List-Id:\s*<(.*)\.france\.debian\.net>/)
+if (/^List-Id:.*<(.*)\.france\.debian\.net>/)
 {
     to $MAILDIR/.debian-france.$MATCH1
 }
@@ -118,6 +118,28 @@ if (/^List-Id:.*<(.*)\.abul\.org>/)
     }
 }
 
+### SYMPA Lists
+if (/^List-Id:.*<sympa-(.*)\.cru\.fr>/)
+{
+    exception {
+        `test -d $MAILDIR/.sympa.$MATCH1`
+        if( $RETURNCODE == 1 )
+            `$MAILDIRMAKE $MAILDIR/.sympa.$MATCH1`
+        to $MAILDIR/.sympa.$MATCH1
+    }
+}
+
+### FDN Lists
+if (/^List-Id:.*<(.*)\.fdn\.fr>/)
+{
+    exception {
+        `test -d $MAILDIR/.abul.$MATCH1`
+        if( $RETURNCODE == 1 )
+            `$MAILDIRMAKE $MAILDIR/.fdn.$MATCH1`
+        to $MAILDIR/.fdn.$MATCH1
+    }
+}
+
 ### Aquitaine libre lists
 if (/^List-Id:.*<(.*)\.listes\.aquitaine-libre\.info>/)
 {

.mutt/conf/mailboxes

@@ -28,21 +28,21 @@ mailboxes +.abul.devel
 mailboxes +.abul.rmll2010
 mailboxes +.abul.tresorier
 
+mailboxes +.fdn
+mailboxes +.fdn.ag
+mailboxes +.fdn.benevoles
+
 mailboxes +.rmll
+mailboxes +.rmll.resa
 mailboxes +.rmll.09
 mailboxes +.rmll.09.org
-mailboxes +.rmll.09.resa
 mailboxes +.rmll.10
 mailboxes +.rmll.10.org
 mailboxes +.rmll.10.programme
 mailboxes +.rmll.10.logistique
-mailboxes +.rmll.10.transports
 mailboxes +.rmll.10.communication
 mailboxes +.rmll.10.reseau
-mailboxes +.rmll.10.isic
 mailboxes +.rmll.10.finance
-mailboxes +.rmll.10.compta
-mailboxes +.rmll.10.invitation
 mailboxes +.rmll.10.notif
 mailboxes +.rmll.10.audiovideo
 mailboxes +.rmll.10.themes
@@ -62,6 +62,7 @@ mailboxes +.debian-france.sl
 
 mailboxes +.debian
 mailboxes +.debian.misc
+mailboxes +.debian.events-eu
 mailboxes +.debian.private
 mailboxes +.debian.devel-french
 mailboxes +.debian.bsd
@@ -74,6 +75,7 @@ mailboxes +.debian.devel
 mailboxes +.debian.project
 mailboxes +.debian.vote
 mailboxes +.debian.security
+mailboxes +.debian.infrastructure-announce
 mailboxes +.debian.devel-changes
 mailboxes +.debian.release
 mailboxes +.debian.bugs-rc
@@ -95,7 +97,10 @@ mailboxes +.groups.aquitaine-libre_org
 mailboxes +.groups.hurd-fr
 
 mailboxes +.debian.alioth
+mailboxes +.debian.alioth.pkg-sympa-devel
+mailboxes +.debian.alioth.pkg-sympa-commits
 mailboxes +.debian.alioth.pkg-phototools-devel
+mailboxes +.debian.alioth.pkg-phototools-commits
 mailboxes +.debian.pkg
 mailboxes +.debian.pkg.exif
 mailboxes +.debian.pkg.sympa
@@ -107,3 +112,10 @@ mailboxes +.debian.pkg.pwman3
 mailboxes +.debian.pkg.weechat
 mailboxes +.debian.pkg.wkhtmltopdf
 
+mailboxes +.sympa
+mailboxes +.sympa.announce
+mailboxes +.sympa.dev
+mailboxes +.sympa.packagers
+mailboxes +.sympa.users
+mailboxes +.sympa.fr
+

.mutt/muttrc

@@ -30,7 +30,7 @@ set timeout         = 240
 
 # sidebar settings
 ifdef sidebar_visible set sidebar_visible = yes
-ifdef sidebar_width set sidebar_width   = 38
+ifdef sidebar_width set sidebar_width   = 42
 
 #set mask="^[^.]"
 #set editor               = "emacs -nw"