emacs: remove kludge for Emacs 23 from notmuch-mua-mail

Notmuch requires at least Emacs version 25.

The `return-action' argument was added prior to Emacs 24.1
in 25ca2e61403f97b5a023164f2924d5f8aca2492a.
This commit is contained in:
Jonas Bernoulli 2020-11-16 22:28:23 +01:00 committed by David Bremner
parent f061ae5b42
commit 1acaaa093c

View file

@ -394,16 +394,10 @@ modified. This function is notmuch adaptation of
(dolist (h other-headers other-headers) (dolist (h other-headers other-headers)
(when (stringp (car h)) (when (stringp (car h))
(setcar h (intern (capitalize (car h)))))))) (setcar h (intern (capitalize (car h))))))))
(args (list yank-action send-actions))
;; Cause `message-setup-1' to do things relevant for mail, ;; Cause `message-setup-1' to do things relevant for mail,
;; such as observe `message-default-mail-headers'. ;; such as observe `message-default-mail-headers'.
(message-this-is-mail t)) (message-this-is-mail t))
;; message-setup-1 in Emacs 23 does not accept return-action (message-setup-1 headers yank-action send-actions return-action))
;; argument. Pass it only if it is supplied by the caller. This
;; will never be the case when we're called by `compose-mail' in
;; Emacs 23.
(when return-action (nconc args (list return-action)))
(apply 'message-setup-1 headers args))
(notmuch-fcc-header-setup) (notmuch-fcc-header-setup)
(message-sort-headers) (message-sort-headers)
(message-hide-headers) (message-hide-headers)