From 8b4dd815816334d54eb08efd07f02c61e309a3ce Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Sun, 10 Jun 2012 16:14:21 +0300
Subject: [PATCH] * mu4e: fix byte-compilation warnings

---
 emacs/mu4e-actions.el |  2 ++
 emacs/mu4e-compose.el | 16 ++++++++++------
 emacs/mu4e-headers.el |  3 ++-
 emacs/mu4e-utils.el   |  2 ++
 emacs/mu4e-view.el    |  4 +++-
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/emacs/mu4e-actions.el b/emacs/mu4e-actions.el
index 6e0ec8ba..aac93fb1 100644
--- a/emacs/mu4e-actions.el
+++ b/emacs/mu4e-actions.el
@@ -26,7 +26,9 @@
 ;; manual)
 
 ;;; Code:
+(eval-when-compile (byte-compile-disable-warning 'cl-functions))
 (require 'cl)
+
 (require 'mu4e-utils)
 (require 'mu4e-meta)
 
diff --git a/emacs/mu4e-compose.el b/emacs/mu4e-compose.el
index 3f777a95..51e64841 100644
--- a/emacs/mu4e-compose.el
+++ b/emacs/mu4e-compose.el
@@ -27,7 +27,10 @@
 
 ;;; Code:
 ;; we use some stuff from gnus..
+
+(eval-when-compile (byte-compile-disable-warning 'cl-functions))
 (require 'cl)
+
 (require 'message)
 (require 'mail-parse)
 (require 'smtpmail)
@@ -100,12 +103,13 @@ of mu4e and emacs."
 plist). This function use gnus' `message-cite-function', and as
 such all its settings apply."
   (with-temp-buffer
-    (insert (mu4e-view-message-text msg))
-    (goto-char (point-min))
-    (push-mark (point-max))
-    (funcall message-cite-function)
-    (pop-mark)
-    (buffer-string)))
+    (when (fboundp 'mu4e-view-message-text) ;; keep bytecompiler happy
+      (insert (mu4e-view-message-text msg))
+      (goto-char (point-min))
+      (push-mark (point-max))
+      (funcall message-cite-function)
+      (pop-mark)
+      (buffer-string))))
 
 
 (defun mu4e~compose-header (hdr val)
diff --git a/emacs/mu4e-headers.el b/emacs/mu4e-headers.el
index 2867d346..c90885da 100644
--- a/emacs/mu4e-headers.el
+++ b/emacs/mu4e-headers.el
@@ -27,11 +27,12 @@
 ;; headers like 'To:' or 'Subject:')
 
 ;; Code:
+(eval-when-compile (byte-compile-disable-warning 'cl-functions))
 (require 'cl)
 
 (require 'hl-line)
-(require 'mu4e-proc)
 (require 'mu4e-utils)    ;; utility functions
+(require 'mu4e-proc)
 (require 'mu4e-vars)
 (require 'mu4e-mark)
 (require 'mu4e-compose)
diff --git a/emacs/mu4e-utils.el b/emacs/mu4e-utils.el
index 101afc18..eb824baa 100644
--- a/emacs/mu4e-utils.el
+++ b/emacs/mu4e-utils.el
@@ -25,7 +25,9 @@
 ;; Utility functions used in the mu4e
 
 ;;; Code:
+(eval-when-compile (byte-compile-disable-warning 'cl-functions))
 (require 'cl)
+
 (require 'html2text)
 (require 'mu4e-vars)
 (require 'doc-view)
diff --git a/emacs/mu4e-view.el b/emacs/mu4e-view.el
index 5bdb47bb..9c0381e9 100644
--- a/emacs/mu4e-view.el
+++ b/emacs/mu4e-view.el
@@ -36,8 +36,10 @@
 ;; we prefer the improved fill-region
 (require 'filladapt nil 'noerror)
 (require 'comint)
-(require 'cl)
 
+(eval-when-compile (byte-compile-disable-warning 'cl-functions))
+(require 'cl)
+ 
 ;; the message view
 (defgroup mu4e-view nil
   "Settings for the message view."