From dc14f93c06a95be59ed5291dd569d855826a0a6b Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Mon, 30 Aug 2021 08:36:41 +0300
Subject: [PATCH] mu4e: remove mu4e-utils

No longer needed; remove all traces.
---
 mu4e/mu4e-headers.el | 5 +----
 mu4e/mu4e-mark.el    | 2 +-
 mu4e/mu4e-org.el     | 2 +-
 mu4e/mu4e-server.el  | 2 +-
 mu4e/mu4e-view.el    | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el
index d6afb0e8..5ae080cf 100644
--- a/mu4e/mu4e-headers.el
+++ b/mu4e/mu4e-headers.el
@@ -36,7 +36,7 @@
 
 (require 'mu4e-update)
 
-(require 'mu4e-utils)    ;; utility functions
+    ;; utility functions
 (require 'mu4e-server)
 (require 'mu4e-vars)
 (require 'mu4e-mark)
@@ -751,15 +751,12 @@ if provided, or at the end of the buffer otherwise."
           (mu4e~headers-add-header line (mu4e-message-field msg :docid)
                                    point msg))))))
 
-
-
 
 ;;; Performing queries (internal)
 (defconst mu4e~search-message "Searching...")
 (defconst mu4e~no-matches     "No matching messages found")
 (defconst mu4e~end-of-results "End of search results")
 
-
 (defun mu4e--search-execute (expr ignore-history)
   "Search for query EXPR.
 
diff --git a/mu4e/mu4e-mark.el b/mu4e/mu4e-mark.el
index 8a44bfc4..feaab1e2 100644
--- a/mu4e/mu4e-mark.el
+++ b/mu4e/mu4e-mark.el
@@ -29,7 +29,7 @@
 
 (require 'cl-lib)
 (require 'mu4e-server)
-(require 'mu4e-utils)
+
 (require 'mu4e-message)
 (require 'mu4e-folders)
 
diff --git a/mu4e/mu4e-org.el b/mu4e/mu4e-org.el
index 7fbf7459..36dd8108 100644
--- a/mu4e/mu4e-org.el
+++ b/mu4e/mu4e-org.el
@@ -29,7 +29,7 @@
 
 (require 'org)
 (require 'mu4e-view)
-(require 'mu4e-utils)
+
 
 (defgroup mu4e-org nil
   "Settings for the org-mode related functionality in mu4e."
diff --git a/mu4e/mu4e-server.el b/mu4e/mu4e-server.el
index c0aff6eb..226b194e 100644
--- a/mu4e/mu4e-server.el
+++ b/mu4e/mu4e-server.el
@@ -137,7 +137,7 @@ sexp received from the server process.")
 
 (defvar mu4e--server-buf nil
   "Buffer (string) for data received from the backend.")
-(defconst mu4e--server-name " *mu4e-server*"
+(defconst mu4e--server-name "*mu4e-server*"
   "Name of the server process, buffer.")
 (defvar mu4e--server-process nil
   "The mu-server process.")
diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el
index 6ece4196..1a30dd57 100644
--- a/mu4e/mu4e-view.el
+++ b/mu4e/mu4e-view.el
@@ -45,7 +45,7 @@
 (require 'mu4e-message)
 (require 'mu4e-server)
 (require 'mu4e-search)
-(require 'mu4e-utils) ;; utility functions
+ ;; utility functions
 (require 'mu4e-contacts)
 (require 'mu4e-vars)