Port the rest of my GNU Emacs configuration to use-package

1 files changed, 43 insertions, 40 deletions

diff --git a/.emacs.d/lisp/bandali-message.el b/.emacs.d/lisp/bandali-message.el
index dd048bb..da14f82 100644
--- a/.emacs.d/lisp/bandali-message.el
+++ b/.emacs.d/lisp/bandali-message.el
@@ -24,41 +24,9 @@
 
 ;;; Code:
 
-(with-eval-after-load 'message
-  ;; Redefine for a simplified In-Reply-To header
-  ;; (https://todo.sr.ht/~sircmpwn/lists.sr.ht/67)
-  (defun message-make-in-reply-to ()
-    "Return the In-Reply-To header for this message."
-    (when message-reply-headers
-      (let ((from (mail-header-from message-reply-headers))
-            (msg-id (mail-header-id message-reply-headers)))
-        (when from
-          msg-id))))
-
-  (setopt
-   message-elide-ellipsis "[...]\n"
-   message-citation-line-format "%N wrote:\n"
-   message-citation-line-function
-   #'message-insert-formatted-citation-line
-   message-confirm-send t
-   message-fill-column 70
-   message-forward-as-mime t
-   ;; message-kill-buffer-on-exit t
-   message-send-mail-function #'smtpmail-send-it
-   message-subscribed-address-functions
-   '(gnus-find-subscribed-addresses)
-   message-dont-reply-to-names
-   (mapconcat
-    #'identity
-    '("bandali@kelar\\.org"
-      "amin@shemshak\\.org"
-      "\\(bandali\\|mab\\|aminb?\\)@gnu\\.org"
-      "a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca"
-      "bandali@gnu\\.ca"
-      "bandali@ubuntu\\.com"
-      "bandali@debian\\.org")
-    "\\|"))
-
+(use-package message
+  :defer t
+  :init
   (defun b/newlines-or-asterism (arg)
     "Create newlines per my liking, or insert asterism if ARG is
 non-nil."
@@ -70,11 +38,46 @@ non-nil."
         (delete-region (point) (line-end-position))
         (newline)
         (open-line 1))))
-  (b/keymap-set message-mode-map "M-RET" #'b/newlines-or-asterism)
-
-  (add-hook 'message-mode-hook #'flyspell-mode)
-  (add-hook
-   'message-mode-hook (lambda () (b/keymap-local-unset "C-c C-s"))))
+  :bind
+  (:map
+   message-mode-map
+   ("C-c C-s" . nil)
+   ("M-RET"   . b/newlines-or-asterism))
+  :hook
+  (message-mode . flyspell-mode)
+  :custom
+  (message-elide-ellipsis "[...]\n")
+  (message-citation-line-format "%N wrote:\n")
+  (message-citation-line-function
+   #'message-insert-formatted-citation-line)
+  (message-confirm-send t)
+  (message-fill-column 70)
+  (message-forward-as-mime t)
+  ;; (message-kill-buffer-on-exit t)
+  (message-send-mail-function #'smtpmail-send-it)
+  (message-subscribed-address-functions
+   '(gnus-find-subscribed-addresses))
+  (message-dont-reply-to-names
+   (mapconcat
+    #'identity
+    '("bandali@kelar\\.org"
+      "amin@shemshak\\.org"
+      "\\(bandali\\|mab\\|aminb?\\)@gnu\\.org"
+      "a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca"
+      "bandali@gnu\\.ca"
+      "bandali@ubuntu\\.com"
+      "bandali@debian\\.org")
+    "\\|"))
+  :config
+  ;; Redefine for a simplified In-Reply-To header
+  ;; (https://todo.sr.ht/~sircmpwn/lists.sr.ht/67)
+  (defun message-make-in-reply-to ()
+    "Return the In-Reply-To header for this message."
+    (when message-reply-headers
+      (let ((from (mail-header-from message-reply-headers))
+            (msg-id (mail-header-id message-reply-headers)))
+        (when from
+          msg-id)))))
 
 (provide 'bandali-message)
 ;;; bandali-message.el ends here