A few small tweaks

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

diff --git a/lisp/bandali-message.el b/lisp/bandali-message.el
index 33bebc9..c063bae 100644 (file)
--- a/lisp/bandali-message.el
+++ b/lisp/bandali-message.el
@@ -1,3 +1,29 @@
+;;; bandali-message.el --- bandali's message.el setup  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2018-2020  Amin Bandali
+
+;; Author: Amin Bandali <bandali@gnu.org>
+;; Keywords: mail, news
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; My setup for message.el.
+
+;;; Code:
+
 (use-package message
   :bind (:map message-mode-map ("<C-return>" . b/insert-asterism))
   :config
@@ -31,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)
@@ -50,10 +76,13 @@
 
 (use-package footnote
   :after message
-  ;; :config
+  :config
   ;; (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
@@ -66,8 +95,6 @@
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 
-(use-package message-x)
-
 (comment
   (use-package message-x
     :custom
@@ -89,4 +116,14 @@
         (gnus-harvest-install 'message-x)
       (gnus-harvest-install))))
 
+(use-package orgalist
+  :after message
+  :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