From a629caef1ae68f42d1535ab96c89e847e7fa637a Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 11 Jan 2023 22:32:09 +0200 Subject: [PATCH] mu4e: avoid byte-compiler warnings --- mu4e/meson.build | 3 +++ mu4e/mu4e-contrib.el | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mu4e/meson.build b/mu4e/meson.build index 2cae9546..ce92438d 100644 --- a/mu4e/meson.build +++ b/mu4e/meson.build @@ -92,6 +92,9 @@ foreach src : mu4e_srcs '--directory', meson.current_build_dir(), '--directory', meson.current_source_dir(), '--eval', '(setq load-prefer-newer t)', + # we don't need warnings for items that have become + # obsolete _after_ our last supported emacs release. + '--eval', '(setq byte-compile-warnings \'(not obsolete))', '--eval', target_func, '--funcall', 'batch-byte-compile', '@INPUT@']) endforeach diff --git a/mu4e/mu4e-contrib.el b/mu4e/mu4e-contrib.el index 4a520f8c..590ffd4c 100644 --- a/mu4e/mu4e-contrib.el +++ b/mu4e/mu4e-contrib.el @@ -160,7 +160,7 @@ the file." (file-directory-p f)) nil (expand-file-name f))) - (mu4e--flatten-list (reverse args)))))) + (eshell-flatten-list (reverse args)))))) ;; warn if user tries to attach without any files marked (if (null files-to-attach) (error "No files to attach") @@ -189,7 +189,7 @@ the file." (goto-char (point-max)) ; attach at end of buffer (while files-to-attach (mml-attach-file (car files-to-attach) - (or (mu4e--mm-default-file-type + (or (mm-default-file-encoding (car files-to-attach)) "application/octet-stream") nil) (setq files-to-attach (cdr files-to-attach)))