emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Mu4e: Better adhere to Doom naming conventions

Browse source
This commit is contained in:
TEC 2021-07-31 01:10:54 +08:00
parent ffaed9f5d7
commit 6915490d21
No known key found for this signature in database
GPG key ID: 779591AFDB81F06C
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/email/mu4e/autoload/email.el
View file

@ -238,7 +238,7 @@ attach a file, or select a folder to open dired in and select file attachments
When otherwise called, open a dired buffer and enable `dired-mu4e-attach-ctrl-c-ctrl-c'." When otherwise called, open a dired buffer and enable `dired-mu4e-attach-ctrl-c-ctrl-c'."
;; TODO add ability to attach files (+dirs) as a single (named) archive ;; TODO add ability to attach files (+dirs) as a single (named) archive
(interactive "p") (interactive "p")
(mu4e-compose-org-msg-handle-toggle (/= 1 files-to-attach)) (+mu4e-compose-org-msg-handle-toggle (/= 1 files-to-attach))
(pcase major-mode (pcase major-mode
((or 'mu4e-compose-mode 'org-msg-edit-mode) ((or 'mu4e-compose-mode 'org-msg-edit-mode)
(let ((mail-buffer (current-buffer)) (let ((mail-buffer (current-buffer))

18
modules/email/mu4e/config.el
View file

@ -166,11 +166,11 @@
;; actually show you all the information you want to see ;; actually show you all the information you want to see
;; so if the header view is entered from a narrow frame, ;; so if the header view is entered from a narrow frame,
;; it's probably worth trying to expand it ;; it's probably worth trying to expand it
(defun mu4e-widen-frame-maybe () (defun +mu4e-widen-frame-maybe ()
"Expand the frame with if it's less than `+mu4e-min-header-frame-width'." "Expand the frame with if it's less than `+mu4e-min-header-frame-width'."
(when (< (frame-width) +mu4e-min-header-frame-width) (when (< (frame-width) +mu4e-min-header-frame-width)
(set-frame-width (selected-frame) +mu4e-min-header-frame-width))) (set-frame-width (selected-frame) +mu4e-min-header-frame-width)))
(add-hook 'mu4e-headers-mode-hook #'mu4e-widen-frame-maybe) (add-hook 'mu4e-headers-mode-hook #'+mu4e-widen-frame-maybe)
(when (fboundp 'imagemagick-register-types) (when (fboundp 'imagemagick-register-types)
(imagemagick-register-types)) (imagemagick-register-types))
@ -221,7 +221,7 @@
(defun org-msg-mode (&optional _) (defun org-msg-mode (&optional _)
"Dummy function." "Dummy function."
(message "Enable the +org mu4e flag to use org-msg-mode.")) (message "Enable the +org mu4e flag to use org-msg-mode."))
(defun mu4e-compose-org-msg-handle-toggle (&rest _) (defun +mu4e-compose-org-msg-handle-toggle (&rest _)
"Placeholder to allow for the assumtion that this function is defined. "Placeholder to allow for the assumtion that this function is defined.
Ignores all arguments and returns nil." Ignores all arguments and returns nil."
nil))) nil)))
@ -241,10 +241,10 @@ Ignores all arguments and returns nil."
(defvar +org-msg-currently-exporting nil (defvar +org-msg-currently-exporting nil
"Helper variable to indicate whether org-msg is currently exporting the org buffer to HTML. "Helper variable to indicate whether org-msg is currently exporting the org buffer to HTML.
Usefull for affecting HTML export config.") Usefull for affecting HTML export config.")
(defadvice! +org-msg--now-exporting (&rest _) (defadvice! +org-msg--now-exporting-a (&rest _)
:before #'org-msg-org-to-xml :before #'org-msg-org-to-xml
(setq +org-msg-currently-exporting t)) (setq +org-msg-currently-exporting t))
(defadvice! +org-msg--not-exporting (&rest _) (defadvice! +org-msg--not-exporting-a (&rest _)
:after #'org-msg-org-to-xml :after #'org-msg-org-to-xml
(setq +org-msg-currently-exporting nil)) (setq +org-msg-currently-exporting nil))
@ -258,22 +258,22 @@ Usefull for affecting HTML export config.")
(defvar +mu4e-compose-org-msg-toggle-next t ; t to initialise org-msg (defvar +mu4e-compose-org-msg-toggle-next t ; t to initialise org-msg
"Whether to toggle ") "Whether to toggle ")
(defun mu4e-compose-org-msg-handle-toggle (toggle-p) (defun +mu4e-compose-org-msg-handle-toggle (toggle-p)
(when (xor toggle-p +mu4e-compose-org-msg-toggle-next) (when (xor toggle-p +mu4e-compose-org-msg-toggle-next)
(org-msg-mode (if org-msg-mode -1 1)) (org-msg-mode (if org-msg-mode -1 1))
(setq +mu4e-compose-org-msg-toggle-next (setq +mu4e-compose-org-msg-toggle-next
(not +mu4e-compose-org-msg-toggle-next)))) (not +mu4e-compose-org-msg-toggle-next))))
(defadvice! mu4e-maybe-toggle-org-msg (orig-fn &optional toggle-p) (defadvice! +mu4e-maybe-toggle-org-msg-a (orig-fn &optional toggle-p)
:around #'mu4e-compose-new :around #'mu4e-compose-new
:around #'mu4e-compose-reply :around #'mu4e-compose-reply
:around #'mu4e-compose-forward :around #'mu4e-compose-forward
:around #'mu4e-compose-resend :around #'mu4e-compose-resend
(interactive "p") (interactive "p")
(mu4e-compose-org-msg-handle-toggle (/= 1 (or toggle-p 0))) (+mu4e-compose-org-msg-handle-toggle (/= 1 (or toggle-p 0)))
(funcall orig-fn)) (funcall orig-fn))
(defadvice! mu4e-draft-open-signature-a (orig-fn compose-type &optional msg) (defadvice! +mu4e-draft-open-signature-a (orig-fn compose-type &optional msg)
"Prevent `mu4e-compose-signature' from being used with `org-msg-mode'." "Prevent `mu4e-compose-signature' from being used with `org-msg-mode'."
:around #'mu4e-draft-open :around #'mu4e-draft-open
(let ((mu4e-compose-signature (unless org-msg-mode mu4e-compose-signature))) (let ((mu4e-compose-signature (unless org-msg-mode mu4e-compose-signature)))