fix(mail): repair account nav, send fallback, and reply handling

Seven config-audit findings in mail-config, each verified against the installed mu4e 1.14 source before changing anything:

- The C-; e account nav commands now require mu4e before searching. The maps register eagerly at startup, but mu4e-search has no autoload cookie, so a nav key pressed before mu4e's first launch signaled void-function.
- With msmtp absent, both send variables now get cj/mail--send-mail-unavailable, which signals a user-error naming msmtp. The old fallback left message-send-mail-function nil (the top-level defvar pre-empts message.el's default), so the first send died with "invalid function: nil".
- I removed the unconditional org-msg-edit-mode advice on the two reply commands. org-msg-post-setup already runs on mu4e-compose-mode-hook and applies org-msg-default-alternatives itself, so the advice forced org-msg onto text-only replies and re-ran a major mode org-msg had already set up.
- I dropped the save-attachment headers action: mu4e-view-save-attachments takes no message argument and reads MIME parts from the view buffer, so it never worked from headers.
- I deleted the obsolete HTML view knobs (mu4e-view-prefer-html and both mu4e-html2text-command sets): the shr-based view has ignored them since mu4e 1.7.
- I reordered the contexts so cjennings.net comes first: with pick-first, gmail-first made gmail the silent default account for the first compose.
- I dropped mu4e-starred-folder (not a mu4e variable, never had an effect) and the obsolete mu4e-maildir alias.

New tests cover the nav-command mu4e load and the msmtp-absent fallback.

3 files changed, 92 insertions, 52 deletions

diff --git a/modules/mail-config.el b/modules/mail-config.el
index 297e70d4..b410bf1b 100644
--- a/modules/mail-config.el
+++ b/modules/mail-config.el
@@ -127,8 +127,17 @@ transport details in debug buffers."
                       "mbsync" "mu4e mail synchronization" 'mail-config)))
     (concat (shell-quote-argument mbsync) " -a")))
 
+(defun cj/mail--send-mail-unavailable (&rest _)
+  "Signal a descriptive error: no mail transport is configured.
+Installed as the send function when msmtp is absent, so a send attempt
+explains itself instead of dying with \"invalid function: nil\" (the
+top-level defvar pre-empts message.el's default)."
+  (user-error "Cannot send mail: msmtp not found -- install msmtp to enable sending"))
+
 (defun cj/mail-configure-smtpmail ()
-  "Configure SMTP mail transport when msmtp is available."
+  "Configure SMTP mail transport when msmtp is available.
+With msmtp absent, install `cj/mail--send-mail-unavailable' on both send
+variables so the failure at send time names the missing transport."
   (setq smtpmail-debug-info cj/smtpmail-debug-enabled)
   (if-let ((msmtp (cj/executable-find-or-warn
                    "msmtp" "SMTP mail sending" 'mail-config)))
@@ -136,7 +145,9 @@ transport details in debug buffers."
             send-mail-function 'message-send-mail-with-sendmail
             message-send-mail-function 'message-send-mail-with-sendmail
             message-sendmail-envelope-from 'header)
-    (setq sendmail-program nil)))
+    (setq sendmail-program nil
+          send-mail-function #'cj/mail--send-mail-unavailable
+          message-send-mail-function #'cj/mail--send-mail-unavailable)))
 
 ;; -------------------- HarfBuzz Crash Fix: Disable Composition ---------------
 ;; Disable auto-composition in mu4e headers to prevent SIGSEGV from HarfBuzz
@@ -229,9 +240,6 @@ Prompts user for the action when executing."
   (setq mu4e-context-policy 'pick-first)                                  ;; start with the first (default) context
   (setq mu4e-headers-auto-update nil)                                     ;; updating headers buffer on email is too jarring
   (setq mu4e-root-maildir mail-dir)                                       ;; root directory for all email accounts
-  (with-suppressed-warnings ((obsolete mu4e-maildir)
-                             (free-vars mu4e-maildir))
-    (setq mu4e-maildir mail-dir))                                         ;; same as above (for newer mu4e)
   (setq mu4e-sent-messages-behavior 'delete)                              ;; don't save to "Sent", IMAP does this already
   (setq mu4e-show-images t)                                               ;; show embedded images
   ;; (setq mu4e-update-interval 600)                                      ;; check for new mail every 10 minutes (600 seconds)
@@ -243,9 +251,6 @@ Prompts user for the action when executing."
   ;; This will be automatically disabled when org-msg is active
   (setq mu4e-compose-format-flowed t)
 
-  (with-suppressed-warnings ((obsolete mu4e-html2text-command)
-                             (free-vars mu4e-html2text-command))
-    (setq mu4e-html2text-command 'mu4e-shr2text))  ;; email conversion to html via shr2text
   (setq mu4e-mu-binary (executable-find "mu"))
   (setq mu4e-get-mail-command (cj/mail--mbsync-command))                  ;; command to sync mail
   (with-suppressed-warnings ((obsolete mu4e-user-mail-address-list)
@@ -257,22 +262,15 @@ Prompts user for the action when executing."
 
   ;; ------------------------------ Mu4e Contexts ------------------------------
 
+  ;; cmail (cjennings.net) is listed first deliberately: `pick-first' makes it
+  ;; the startup context, matching cmail's primary role everywhere else in the
+  ;; config (shortcuts, bookmarks, refile).  Gmail-first here made gmail the
+  ;; silent default for the first compose.  (mu4e-starred-folder was dropped:
+  ;; it isn't a mu4e variable, so it never had an effect -- flagged searches
+  ;; use flag:flagged.)
   (setq mu4e-contexts
         (list
          (make-mu4e-context
-          :name "gmail.com"
-          :match-func
-          (lambda (msg)
-            (when msg
-              (string-prefix-p "/gmail" (mu4e-message-field msg :maildir))))
-          :vars '((user-mail-address        . "craigmartinjennings@gmail.com")
-                  (user-full-name           . "Craig Jennings")
-                  (mu4e-drafts-folder       . "/gmail/Drafts")
-                  (mu4e-sent-folder         . "/gmail/Sent")
-                  (mu4e-starred-folder      . "/gmail/Starred")
-                  (mu4e-trash-folder        . "/gmail/Trash")))
-
-         (make-mu4e-context
           :name "cjennings.net"
           :match-func
           (lambda (msg)
@@ -285,6 +283,18 @@ Prompts user for the action when executing."
                   (mu4e-trash-folder    . "/cmail/Trash")))
 
          (make-mu4e-context
+          :name "gmail.com"
+          :match-func
+          (lambda (msg)
+            (when msg
+              (string-prefix-p "/gmail" (mu4e-message-field msg :maildir))))
+          :vars '((user-mail-address        . "craigmartinjennings@gmail.com")
+                  (user-full-name           . "Craig Jennings")
+                  (mu4e-drafts-folder       . "/gmail/Drafts")
+                  (mu4e-sent-folder         . "/gmail/Sent")
+                  (mu4e-trash-folder        . "/gmail/Trash")))
+
+         (make-mu4e-context
           :name "deepsat.com"
           :match-func
           (lambda (msg)
@@ -294,7 +304,6 @@ Prompts user for the action when executing."
                   (user-full-name           . "Craig Jennings")
                   (mu4e-drafts-folder       . "/dmail/Drafts")
                   (mu4e-sent-folder         . "/dmail/Sent")
-                  (mu4e-starred-folder      . "/dmail/Starred")
                   (mu4e-trash-folder        . "/dmail/Trash")))))
 
   ;; Refile target is computed per message (see `cj/mu4e--refile-folder'), not
@@ -348,25 +357,11 @@ Prompts user for the action when executing."
 
   ;; ------------------------------ HTML Settings ------------------------------
   ;; also see org-msg below
-
-  ;; Prefer HTML over plain text when both are available
-  (with-suppressed-warnings ((obsolete mu4e-view-prefer-html)
-                             (free-vars mu4e-view-prefer-html))
-    (setq mu4e-view-prefer-html t))
-
-  ;; Use a better HTML renderer with more control
-  (with-suppressed-warnings ((obsolete mu4e-html2text-command)
-                             (free-vars mu4e-html2text-command))
-    (setq mu4e-html2text-command
-		  (cond
-		   ;; Best option: pandoc (if available)
-		   ((executable-find "pandoc")
-		    "pandoc -f html -t plain --reference-links")
-		   ;; Good option: w3m (better tables/formatting)
-		   ((executable-find "w3m")
-		    "w3m -dump -T text/html -cols 72 -o display_link_number=true")
-		   ;; Fallback: built-in shr
-		   (t 'mu4e-shr2text))))
+  ;;
+  ;; The view is shr-based since mu4e 1.7; the old knobs
+  ;; (mu4e-view-prefer-html, mu4e-html2text-command and its pandoc/w3m
+  ;; renderer selection) are obsolete and ignored on 1.14, so they were
+  ;; dropped.  HTML display is governed by the shr settings below.
 
   ;; Configure shr (built-in HTML renderer) for better display
   (setq shr-use-colors nil)          ; Don't use colors in terminal
@@ -407,10 +402,12 @@ Echoes the effective state so there's no guessing what a refresh did."
 	(message "Remote images: %s (this message only)"
 			 (if (equal gnus-blocked-images "http") "blocked" "shown")))
 
-  ;; first letter is the keybinding
+  ;; first letter is the keybinding.  No save-attachment action here:
+  ;; mu4e-view-save-attachments reads MIME parts from the view buffer (and
+  ;; takes no message argument), so it cannot work from headers -- open the
+  ;; message and save from the view instead.
   (setq mu4e-headers-actions
-		'(("asave attachment"   . mu4e-view-save-attachments)
-		  ("csave contact"      . mu4e-action-add-org-contact)
+		'(("csave contact"      . mu4e-action-add-org-contact)
 		  ("ssearch for sender" . cj/search-for-sender)
 		  ("tshow this thread"  . mu4e-action-show-thread)
 		  ("vview in browser"   . mu4e-action-view-in-browser)))
@@ -483,12 +480,18 @@ INBOX maildir."
   (defun cj/--mail-make-account-map (account)
     "Build a mu4e navigation keymap for ACCOUNT (a maildir account name).
 Keys i/u/s/l run the inbox/unread/flagged/large searches from
-`cj/--mail-account-search-queries', each scoped to ACCOUNT."
+`cj/--mail-account-search-queries', each scoped to ACCOUNT.  Each command
+requires mu4e first: these maps register eagerly at startup, but
+`mu4e-search' has no autoload cookie, so a nav key pressed before mu4e's
+first launch would otherwise signal void-function.  With the feature
+loaded, mu4e itself starts the server on demand."
     (let ((map (make-sparse-keymap)))
       (dolist (entry (cj/--mail-account-search-queries account) map)
         (let ((query (cdr entry)))
           (keymap-set map (car entry)
-                      (lambda () (interactive) (mu4e-search query))))))))
+                      (lambda () (interactive)
+                        (require 'mu4e)
+                        (mu4e-search query))))))))
 
 ;; ---------------------------------- Org-Msg ----------------------------------
 ;; user composes org mode; recipient receives html
@@ -577,10 +580,12 @@ Keys i/u/s/l run the inbox/unread/flagged/large searches from
   ;; turn on org-msg in all compose buffers
   (org-msg-mode +1))
 
-(advice-add #'mu4e-compose-reply
-			:after (lambda (&rest _) (org-msg-edit-mode)))
-(advice-add #'mu4e-compose-wide-reply
-			:after (lambda (&rest _) (org-msg-edit-mode)))
+;; No reply advice here: org-msg-post-setup runs on mu4e-compose-mode-hook for
+;; every compose (replies included) and applies `org-msg-default-alternatives'
+;; itself.  The old unconditional org-msg-edit-mode :after advice on the two
+;; reply commands forced org-msg onto text-only replies, defeating the
+;; (reply-to-text . (text)) alternative above and re-running a major mode
+;; org-msg had already set up.
 
 ;; which-key labels
 (with-eval-after-load 'which-key
diff --git a/tests/test-mail-config--account-search-queries.el b/tests/test-mail-config--account-search-queries.el
index 9f1b6b3e..02a74692 100644
--- a/tests/test-mail-config--account-search-queries.el
+++ b/tests/test-mail-config--account-search-queries.el
@@ -38,9 +38,12 @@
 
 (ert-deftest test-mail-make-account-map-closures-capture-distinct-queries ()
   "Normal: each binding runs its own account-scoped search (no closure leak).
-mu4e-search is mocked to capture the query each command passes."
+mu4e-search is mocked to capture the query each command passes; require is
+mocked so the commands' mu4e load never pulls the real package in batch."
   (let ((searched '()))
-    (cl-letf (((symbol-function 'mu4e-search)
+    (cl-letf (((symbol-function 'require)
+               (lambda (feature &rest _) feature))
+              ((symbol-function 'mu4e-search)
                (lambda (q) (push q searched))))
       (let ((map (cj/--mail-make-account-map "dmail")))
         (funcall (keymap-lookup map "i"))
@@ -49,5 +52,20 @@ mu4e-search is mocked to capture the query each command passes."
     (should (member "maildir:/dmail/INBOX AND flag:unread AND NOT flag:trashed"
                     searched))))
 
+(ert-deftest test-mail-make-account-map-loads-mu4e-before-search ()
+  "Error: a nav command loads mu4e before it calls `mu4e-search'.
+The C-; e maps register eagerly at startup, but `mu4e-search' carries no
+autoload cookie, so a nav key pressed before mu4e's first launch signaled
+void-function.  The command must require mu4e first, then search."
+  (let ((events '()))
+    (cl-letf (((symbol-function 'require)
+               (lambda (feature &rest _) (push (list :require feature) events) feature))
+              ((symbol-function 'mu4e-search)
+               (lambda (q) (push (list :search q) events))))
+      (funcall (keymap-lookup (cj/--mail-make-account-map "cmail") "i")))
+    (should (equal (nreverse events)
+                   '((:require mu4e)
+                     (:search "maildir:/cmail/INBOX"))))))
+
 (provide 'test-mail-config--account-search-queries)
 ;;; test-mail-config--account-search-queries.el ends here
diff --git a/tests/test-mail-config-transport.el b/tests/test-mail-config-transport.el
index 0240102a..9329ac70 100644
--- a/tests/test-mail-config-transport.el
+++ b/tests/test-mail-config-transport.el
@@ -66,6 +66,23 @@ EXECUTABLES is an alist of program name strings to executable paths."
       (should (equal test-mail-config--warnings
                      '((mail-config . "msmtp not found; SMTP mail sending unavailable")))))))
 
+(ert-deftest test-mail-config-transport-msmtp-missing-sets-descriptive-fallback ()
+  "Error: with msmtp absent, the send functions get a descriptive fallback.
+The old behavior left `message-send-mail-function' nil (the top-level defvar
+pre-empts message.el's default), so the first send died with \"invalid
+function: nil\".  The fallback must be installed on both send variables and
+must signal a `user-error' that names msmtp."
+  (test-mail-config--with-executables nil
+    (let (send-mail-function message-send-mail-function)
+      (cj/mail-configure-smtpmail)
+      (should (eq send-mail-function #'cj/mail--send-mail-unavailable))
+      (should (eq message-send-mail-function #'cj/mail--send-mail-unavailable))
+      (should-error (cj/mail--send-mail-unavailable) :type 'user-error)
+      (condition-case err
+          (cj/mail--send-mail-unavailable)
+        (user-error
+         (should (string-match-p "msmtp" (cadr err))))))))
+
 (ert-deftest test-mail-config-transport-mbsync-present-builds-command ()
   "When mbsync exists, build the mu4e sync command."
   (test-mail-config--with-executables '(("mbsync" . "/usr/bin/mbsync"))