From 9bcb8c86c0a6e99d1fd26fd8b9d5f5e2929fe3fc Mon Sep 17 00:00:00 2001
From: Daniel Borchmann <daniel@algebra20.de>
Date: Tue, 14 Nov 2017 16:21:38 +0100
Subject: [PATCH] =?UTF-8?q?[Misc]=20Replace=20custom=20mail=20addresses=20?=
 =?UTF-8?q?by=20=E2=80=98db/additional-mail-addresses=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gnus    | 17 ++++++-----------
 init.el | 15 +++++----------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/gnus b/gnus
index 6ee9ad6..6b0fc13 100644
--- a/gnus
+++ b/gnus
@@ -33,7 +33,7 @@ SMTP user."
            (string :tag "SMTP Login  Name"))))
 
 (defcustom db/personal-gnus-filter-rules nil
-  "Default filter rules as used by Gnus for `db/personal-mail-address’."
+  "Default filter rules as used by Gnus for `user-mail-address’."
   :group 'personal-settings
   :type 'sexp)
 
@@ -59,7 +59,7 @@ SMTP user."
 ;; Accounts
 
 (setq-default message-dont-reply-to-names
-              (regexp-opt (list db/personal-mail-address db/work-mail-address)
+              (regexp-opt (cons user-mail-address db/additional-mail-addresses)
                           'words))
 
 (setq gnus-select-method '(nnnil "")
@@ -570,17 +570,12 @@ If found, imports the certificate via gpgsm."
 
 ;;; Mail Formatting
 
-(setq gnus-posting-styles               ; needs to be cleaned up somewhen
+(setq gnus-posting-styles
       `((".*"
          (name ,user-full-name)
-         (address ,db/personal-mail-address)
-         (signature-file "~/.signature-minimal")
-         ("X-Jabber-ID" ,db/jabber-id))
-        (message-mail-p
-         (signature-file "~/.signature"))
-        ("algebra20:.*"
-         (address ,db/personal-mail-address)
-         (signature-file "~/.signature"))))
+         (address ,user-mail-address)
+         (signature-file "~/.signature")
+         ("X-Jabber-ID" ,db/jabber-id))))
 
 ;; http://mbork.pl/2015-11-28_Fixing_mml-attach-file_using_advice
 (defun db/mml-attach-file--go-to-eob (orig-fun &rest args)
diff --git a/init.el b/init.el
index 6583e7c..3a17754 100644
--- a/init.el
+++ b/init.el
@@ -336,15 +336,10 @@ _h_   _l_   _o_k        _y_ank
   :group 'help
   :tag "Personal settings")
 
-(defcustom db/personal-mail-address ""
-  "Primary email address used for personal communication."
+(defcustom db/additional-mail-addresses nil
+  "List of additional email addresses (apart from `user-mail-address’)."
   :group 'personal-settings
-  :type 'string)
-
-(defcustom db/work-mail-address ""
-  "Primary email address used for email communication at work."
-  :group 'personal-settings
-  :type 'string)
+  :type '(repeat string))
 
 (defcustom db/jabber-id ""
   "Personal XMPP ID."
@@ -659,8 +654,8 @@ _h_   _l_   _o_k        _y_ank
                   bbdb-mua-auto-update-p 'query
                   bbdb-default-country "Germany"
                   bbdb-user-mail-address-re (regexp-opt
-                                             (list db/personal-mail-address
-                                                   db/work-mail-address)))
+                                             (cons user-mail-address
+                                                   db/additional-mail-addresses)))
             (add-hook 'message-setup-hook 'bbdb-mail-aliases)
             (add-hook 'mail-setup-hook 'bbdb-mail-aliases)
             (run-with-timer 0 3600 #'bbdb-save)))