X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/076e900995d9d71d54e3788691cd0958f38c6dfc..dbbfe61bc3677a5755a7c3987706aebb8fae0fd8:/lisp/bandali-message.el?ds=inline

diff --git a/lisp/bandali-message.el b/lisp/bandali-message.el
index 750188c..7d8edf4 100644
--- a/lisp/bandali-message.el
+++ b/lisp/bandali-message.el
@@ -51,13 +51,15 @@
          b/message-cite-style-format)))
     "Citation style based on Mozilla Thunderbird's. Use with message-cite-style.")
   (setq ;; message-cite-style 'message-cite-style-bandali
-        message-kill-buffer-on-exit t
-        message-send-mail-function 'message-send-mail-with-sendmail
-        message-sendmail-envelope-from 'header
-        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\\)\\)")
+   message-citation-line-format "%N writes:\n"
+   message-citation-line-function 'message-insert-formatted-citation-line
+   message-kill-buffer-on-exit t
+   message-send-mail-function 'message-send-mail-with-sendmail
+   message-sendmail-envelope-from 'header
+   message-subscribed-address-functions
+   '(gnus-find-subscribed-addresses)
+   message-dont-reply-to-names
+   "\\(\\(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 +120,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