update my uwaterloo addresses, simplify message-dont-reply-to-names

diff --git a/.config/msmtp/config b/.config/msmtp/config
index 6a4d9e1..422ca83 100644 (file)
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -41,11 +41,14 @@ from mab@gnu.org
 account uwaterloo
 host connect.uwaterloo.ca
 tls_starttls on
-from bandali@uwaterloo.ca
+from abandali@uwaterloo.ca
 user abandali
 passwordeval gpg --no-tty -q -d ~/.passwd/uwaterloo.gpg
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
+account uwaterloo-friendly : uwaterloo
+from bandali@uwaterloo.ca
+
 account csclub
 host mail.csclub.uwaterloo.ca
 tls_starttls on
@@ -54,5 +57,8 @@ user abandali
 passwordeval gpg --no-tty -q -d ~/.passwd/csclub.gpg
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
+account csclub-friendly : csclub
+from bandali@csclub.uwaterloo.ca
+
 # Set a default account
 account default : shemshak

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 759bfce..f7fad89 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -2291,7 +2291,7 @@ https://csclub.uwaterloo.ca/~abandali")
           ("nnimap\\+uw:INBOX"
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"
-           (address "abandali@csclub.uwaterloo.ca")
+           (address "bandali@csclub.uwaterloo.ca")
            (signature b/csc-signature)
            (gcc "nnimap+csc:Sent")))))
 
@@ -2369,7 +2369,7 @@ https://csclub.uwaterloo.ca/~abandali")
         message-subscribed-address-functions
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
-        "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(\\(a\\(min\\.\\)?\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")
+        "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")
   (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)