fix some compilation warnings

2 files changed, 10 insertions, 6 deletions

diff --git a/evil-commands.el b/evil-commands.el
index 022d00b..f442443 100644
--- a/evil-commands.el
+++ b/evil-commands.el
@@ -2748,9 +2748,10 @@ the previous shell command is executed instead."
 If ARG is nil this function calls `recompile', otherwise it calls
 `compile' passing ARG as build command."
   (interactive "<sh>")
-  (if arg
-      (compile arg)
-    (recompile)))
+  (if (and (fboundp 'recompile)
+           (not arg))
+      (recompile)
+    (compile arg)))
 
 ;; TODO: escape special characters (currently only \n) ... perhaps
 ;; there is some Emacs function doing this?
diff --git a/evil-integration.el b/evil-integration.el
index 08a273b..3d17009 100644
--- a/evil-integration.el
+++ b/evil-integration.el
@@ -212,13 +212,15 @@
   (global-undo-tree-mode 1))
 
 (eval-after-load 'undo-tree
-  '(progn
+  '(with-no-warnings
      (defun evil-turn-on-undo-tree-mode ()
        "Enable `undo-tree-mode' if evil is enabled.
 This function enables `undo-tree-mode' when Evil is activated in
 some buffer, but only if `global-undo-tree-mode' is also
 activated."
-       (when global-undo-tree-mode (undo-tree-mode 1)))
+       (when (and (boundp 'global-undo-tree-mode)
+                  global-undo-tree-mode)
+         (undo-tree-mode 1)))
 
      (add-hook 'evil-local-mode-hook #'evil-turn-on-undo-tree-mode)
 
@@ -443,7 +445,8 @@ the mark and entering `recursive-edit'."
 ;;; nXhtml/mumamo
 ;; ensure that mumamo does not toggle evil through its globalized mode
 (eval-after-load 'mumamo
-  '(push 'evil-mode-cmhh mumamo-change-major-mode-no-nos))
+  '(with-no-warnings
+     (push 'evil-mode-cmhh mumamo-change-major-mode-no-nos)))
 
 (provide 'evil-integration)