From 24a6b71bd0552429d3faf32ccf0a4237d50c132a Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Sun, 22 Dec 2019 15:11:09 +0200
Subject: [PATCH] mu4e: move mu4e-bookmark defstruct to vars

Avoid compilation problem.
---
 mu4e/mu4e-utils.el | 12 ------------
 mu4e/mu4e-vars.el  | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mu4e/mu4e-utils.el b/mu4e/mu4e-utils.el
index 3946c043..1dbfe0f9 100644
--- a/mu4e/mu4e-utils.el
+++ b/mu4e/mu4e-utils.el
@@ -396,18 +396,6 @@ and offer to create it if it does not exist yet."
 	      (mu4e~proc-mkdir fullpath)))
     mdir))
 
-
-(cl-defstruct mu4e-bookmark
-  "A mu4e bookmarl object with the following members:
-- `name': the user-visible name of the bookmark
-- `key': a single key to search for this bookmark
-- `query': the query for this bookmark. Either a literal string or a function
-   that evaluates to a string."
-  name                      ;; name/description of the bookmark
-  query                     ;; a query (a string or a function evaluation to string)
-  key                       ;; key to activate the bookmark
-  )
-
 (defun mu4e-bookmarks ()
   "Get `mu4e-bookmarks' in the (new) format, converting from the old
 format if needed."
diff --git a/mu4e/mu4e-vars.el b/mu4e/mu4e-vars.el
index ed597756..b69d35d7 100644
--- a/mu4e/mu4e-vars.el
+++ b/mu4e/mu4e-vars.el
@@ -29,6 +29,7 @@
 (require 'mu4e-meta)
 (require 'message)
 
+
 (defgroup mu4e nil
   "mu4e - mu for emacs"
   :group 'mail)
@@ -200,6 +201,17 @@ If the string exceeds this limit, it will be truncated to fit."
 (defvar mu4e-debug nil
   "When set to non-nil, log debug information to the *mu4e-log* buffer.")
 
+(cl-defstruct mu4e-bookmark
+  "A mu4e bookmarl object with the following members:
+- `name': the user-visible name of the bookmark
+- `key': a single key to search for this bookmark
+- `query': the query for this bookmark. Either a literal string or a function
+   that evaluates to a string."
+  name                      ;; name/description of the bookmark
+  query                     ;; a query (a string or a function evaluation to string)
+  key                       ;; key to activate the bookmark
+  )
+
 (defcustom mu4e-bookmarks
   `( ,(make-mu4e-bookmark
         :name  "Unread messages"