[elpa] master 1743a80 07/42: Merge pull request #42 from tarsius/silentio

[Dmitry Gutov]

branch: master
commit 1743a80ecc573a0658a98256ea470a366e1e3796
Merge: d6b7d82 733ad33
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Merge pull request #42 from tarsius/silentio
    
    silence byte-compiler
---
 diff-hl-margin.el |    2 ++
 diff-hl.el        |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/diff-hl-margin.el b/diff-hl-margin.el
index 4f99994..4b359a3 100644
--- a/diff-hl-margin.el
+++ b/diff-hl-margin.el
@@ -38,6 +38,8 @@
 (require 'diff-hl)
 (require 'diff-hl-dired)
 
+(defvar diff-hl-margin-side)
+
 (defvar diff-hl-margin-old-highlight-function nil)
 
 (defgroup diff-hl-margin nil
diff --git a/diff-hl.el b/diff-hl.el
index a3e5447..64f2d75 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -59,7 +59,8 @@
   (require 'cl-lib)
   (require 'vc-git)
   (require 'vc-hg)
-  (require 'face-remap))
+  (require 'face-remap)
+  (declare-function smartrep-define-key 'smartrep))
 
 (defgroup diff-hl nil
   "VC diff highlighting on the side of a window"