mu4e: mark mu4e-sent-func as obsolete

mu4e-sent-func was used internally (triggered by mu-server), but is no
longer in use, so let's remove it and mark as obsolete.

Obsolete its callers as well.
This commit is contained in:
Dirk-Jan C. Binnema
2024-05-15 02:53:22 +03:00
parent a9495f7be5
commit 7c22e95b5e
4 changed files with 20 additions and 28 deletions

View File

@ -66,10 +66,10 @@
"Icalendar related settings." "Icalendar related settings."
:group 'mu4e) :group 'mu4e)
(defcustom mu4e-icalendar-trash-after-reply nil ;; (defcustom mu4e-icalendar-trash-after-reply nil
"If non-nil, trash the icalendar invitation after replying." ;; "If non-nil, trash the icalendar invitation after replying."
:type 'boolean ;; :type 'boolean
:group 'mu4e-icalendar) ;; :group 'mu4e-icalendar)
(defcustom mu4e-icalendar-diary-file nil (defcustom mu4e-icalendar-diary-file nil
"If non-nil, the file in which to add events upon reply." "If non-nil, the file in which to add events upon reply."
@ -142,11 +142,12 @@
(mml-insert-empty-tag 'part 'type "text/plain") (mml-insert-empty-tag 'part 'type "text/plain")
(mml-attach-buffer ical-name (mml-attach-buffer ical-name
"text/calendar; method=REPLY; charset=UTF-8") "text/calendar; method=REPLY; charset=UTF-8")
(when mu4e-icalendar-trash-after-reply ;; XXX: not currently supported
;; Override `mu4e-sent-handler' set by `mu4e-compose-mode' to ;;(when mu4e-icalendar-trash-after-reply
;; also trash the message (thus must be appended to hooks). ;; ;; Override `mu4e-sent-handler' set by `mu4e-compose-mode' to
(add-hook 'message-sent-hook ;; ;; also trash the message (thus must be appended to hooks).
(mu4e--icalendar-trash-message-hook msg) 90 t)) ;; (add-hook 'message-sent-hook
;; (mu4e--icalendar-trash-message-hook msg) 90 t))
(when gnus-icalendar-org-enabled-p (when gnus-icalendar-org-enabled-p
(if (gnus-icalendar-find-org-event-file event) (if (gnus-icalendar-find-org-event-file event)
@ -175,11 +176,11 @@
(or (mu4e-view-headers-next) (or (mu4e-view-headers-next)
(kill-buffer-and-window)))))) (kill-buffer-and-window))))))
(defun mu4e--icalendar-trash-message-hook (original-msg) ;; (defun mu4e--icalendar-trash-message-hook (original-msg)
"Trash the iCalendar message ORIGINAL-MSG." ;; "Trash the iCalendar message ORIGINAL-MSG."
(lambda () ;; (lambda ()
(setq mu4e-sent-func ;; (setq mu4e-sent-func
(mu4e--icalendar-trash-message original-msg)))) ;; (mu4e--icalendar-trash-message original-msg))))
(defun mu4e--icalendar-insert-diary (event reply-status filename) (defun mu4e--icalendar-insert-diary (event reply-status filename)
"Insert a diary entry for the EVENT in file named FILENAME. "Insert a diary entry for the EVENT in file named FILENAME.

View File

@ -229,6 +229,7 @@
(make-obsolete-variable 'mu4e-header-func "mu4e-headers-append-func" "1.7.4") (make-obsolete-variable 'mu4e-header-func "mu4e-headers-append-func" "1.7.4")
(make-obsolete-variable 'mu4e-temp-func "No longer used" "1.7.0") (make-obsolete-variable 'mu4e-temp-func "No longer used" "1.7.0")
(make-obsolete-variable 'mu4e-sent-func "No longer used" "1.12.5")
;; mu4e-update ;; mu4e-update
@ -276,6 +277,9 @@
(define-obsolete-function-alias 'mu4e-icalendar-setup (define-obsolete-function-alias 'mu4e-icalendar-setup
'gnus-icalendar-setup '"1.11.22") 'gnus-icalendar-setup '"1.11.22")
(make-obsolete-variable 'mu4e-icalendar-trash-after-reply
"Not functional after composer changes"
"1.12.5")
;; mu4e. ;; mu4e.
(define-obsolete-function-alias 'mu4e-clear-caches #'ignore "1.11.15") (define-obsolete-function-alias 'mu4e-clear-caches #'ignore "1.11.15")

View File

@ -1,6 +1,6 @@
;;; mu4e-server.el --- Control mu server from mu4e -*- lexical-binding: t -*- ;;; mu4e-server.el --- Control mu server from mu4e -*- lexical-binding: t -*-
;; Copyright (C) 2011-2023 Dirk-Jan C. Binnema ;; Copyright (C) 2011-2024 Dirk-Jan C. Binnema
;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
@ -117,11 +117,6 @@ See `mu4e--server-filter' for the format.")
This happens when some message has been deleted. The function is This happens when some message has been deleted. The function is
passed the docid of the removed message.") passed the docid of the removed message.")
(defvar mu4e-sent-func nil
"Function called for each :sent sexp received.
This happens when some message has been sent. The function is
passed the docid and the draft-path of the sent message.")
(defvar mu4e-view-func nil (defvar mu4e-view-func nil
"Function called for each single-message sexp. "Function called for each single-message sexp.
The function is passed a message sexp as argument. See The function is passed a message sexp as argument. See
@ -358,12 +353,6 @@ The server output is as follows:
((plist-get sexp :erase) ((plist-get sexp :erase)
(funcall mu4e-erase-func)) (funcall mu4e-erase-func))
;; receive a :sent message
((plist-get sexp :sent)
(funcall mu4e-sent-func
(plist-get sexp :docid)
(plist-get sexp :path)))
;; received a pong message ;; received a pong message
((plist-get sexp :pong) ((plist-get sexp :pong)
(setq mu4e--server-props (plist-get sexp :props)) (setq mu4e--server-props (plist-get sexp :props))

View File

@ -253,8 +253,6 @@ chance."
(mu4e-setq-if-nil mu4e-headers-append-func #'mu4e~headers-append-handler) (mu4e-setq-if-nil mu4e-headers-append-func #'mu4e~headers-append-handler)
(mu4e-setq-if-nil mu4e-found-func #'mu4e~headers-found-handler) (mu4e-setq-if-nil mu4e-found-func #'mu4e~headers-found-handler)
(mu4e-setq-if-nil mu4e-erase-func #'mu4e~headers-clear) (mu4e-setq-if-nil mu4e-erase-func #'mu4e~headers-clear)
(mu4e-setq-if-nil mu4e-sent-func #'mu4e--default-handler)
(mu4e-setq-if-nil mu4e-contacts-func #'mu4e--update-contacts) (mu4e-setq-if-nil mu4e-contacts-func #'mu4e--update-contacts)
(mu4e-setq-if-nil mu4e-info-func #'mu4e--info-handler) (mu4e-setq-if-nil mu4e-info-func #'mu4e--info-handler)
(mu4e-setq-if-nil mu4e-pong-func #'mu4e--default-handler) (mu4e-setq-if-nil mu4e-pong-func #'mu4e--default-handler)