From 076e900995d9d71d54e3788691cd0958f38c6dfc Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sat, 25 Apr 2020 16:20:13 -0400
Subject: [PATCH] Move which-key footnote replacement to
 lisp/bandali-message.el.

Also, remove (use-package message-x).  Doesn't seem to be needed for
tab completion of Gcc in message.el.
---
 init.el                 | 2 --
 lisp/bandali-message.el | 7 ++++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/init.el b/init.el
index a5fdea4..88cbc9b 100644
--- a/init.el
+++ b/init.el
@@ -960,8 +960,6 @@ Make N (default: 1) copies of the current line or region."
     "C-c t"   "themes")
 
   ;; prefixes for major modes
-  (which-key-add-major-mode-key-based-replacements 'message-mode
-    "C-c f n" "footnote")
   (which-key-add-major-mode-key-based-replacements 'org-mode
     "C-c C-v" "org-babel")
 
diff --git a/lisp/bandali-message.el b/lisp/bandali-message.el
index ca30dc4..750188c 100644
--- a/lisp/bandali-message.el
+++ b/lisp/bandali-message.el
@@ -76,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
@@ -92,8 +95,6 @@
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 
-(use-package message-x)
-
 (comment
   (use-package message-x
     :custom
-- 
2.20.1