Update 5 drones

[~bandali/configs] / lisp / bandali-message.el

diff --git a/lisp/bandali-message.el b/lisp/bandali-message.el
index ca30dc4..7d8edf4 100644 (file)
--- 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
          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)
   ;; (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)


@@ -76,10 +78,13 @@
 
 (use-package footnote
   :after message
 
 (use-package footnote
   :after message

-  ;; :config
+  :config

   ;; (setq footnote-start-tag ""
   ;;       footnote-end-tag   ""
   ;;       footnote-style     'unicode)
   ;; (setq footnote-start-tag ""
   ;;       footnote-end-tag   ""
   ;;       footnote-style     'unicode)

+  (when (featurep 'which-key)
+    (which-key-add-major-mode-key-based-replacements 'message-mode
+      "C-c f n" "footnote"))

   :bind
   (:map message-mode-map
         :prefix-map b/footnote-prefix-map
   :bind
   (:map message-mode-map
         :prefix-map b/footnote-prefix-map


@@ -92,8 +97,6 @@
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 

-(use-package message-x)
-

 (comment
   (use-package message-x
     :custom
 (comment
   (use-package message-x
     :custom


@@ -117,7 +120,12 @@
 
 (use-package orgalist
   :after message
 
 (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
 
 (provide 'bandali-message)
 ;;; bandali-message.el ends here