X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/076e900995d9d71d54e3788691cd0958f38c6dfc..6b09fc8a2951778cd3ff9807d7132dcfb1f7de38:/lisp/bandali-message.el

diff --git a/lisp/bandali-message.el b/lisp/bandali-message.el
index 750188c..c063bae 100644
--- a/lisp/bandali-message.el
+++ b/lisp/bandali-message.el
@@ -57,7 +57,7 @@
         message-subscribed-address-functions
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
-        "\\(\\(amin@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")
+        "\\(\\(amin@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|bandali@fsf\\.org\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")
   ;; (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
@@ -118,7 +118,12 @@
 
 (use-package orgalist
   :after message
-  :hook (message-mode . orgalist-mode))
+  :hook (message-mode . (lambda ()
+                          ;; work around incompatibility between
+                          ;; orgalist and yasnippet
+                          (yas-minor-mode -1)
+                          (orgalist-mode 1)
+                          (yas-minor-mode 1))))
 
 (provide 'bandali-message)
 ;;; bandali-message.el ends here