Merge commit 'af601c4a8a087cc5a12a08e08af094c4e21d417c' from diff-hl

diff --combined packages/diff-hl/diff-hl-dired.el
index a31a7a6c467d674e32b860afb8501324a47f0b64,a94be03066d0a9fe4b069a69b5cb638c6ca3c91a..a94be03066d0a9fe4b069a69b5cb638c6ca3c91a
--- 1/packages/diff-hl/diff-hl-dired.el
--- 2/diff-hl-dired.el
+++ b/packages/diff-hl/diff-hl-dired.el
@@@ -27,6 -27,8 +27,8 @@@
  
  (require 'diff-hl)
  
+ (defvar diff-hl-dired-process-buffer nil)
+ 
  ;;;###autoload
  (define-minor-mode diff-hl-dired-mode
    "Toggle VC diff highlighting on the side of a Dired window."
@@@ -39,8 -41,6 +41,6 @@@
      (remove-hook 'dired-after-readin-hook 'diff-hl-dired-update t)
      (diff-hl-dired-clear)))
  
- (defvar diff-hl-dired-process-buffer nil)
- 
  (defun diff-hl-dired-update ()
    "Highlight the Dired buffer."
    (let ((backend (ignore-errors (vc-responsible-backend default-directory)))
@@@ -59,7 -59,7 +59,7 @@@
          (erase-buffer)
          (vc-call-backend
           backend 'dir-status def-dir
-          (lambda (entries &optional more-to-come)
+          (lambda (entries &optional _more-to-come)
             (with-current-buffer buffer
               (dolist (entry entries)
                 (cl-destructuring-bind (file state &rest) entry

diff --combined packages/diff-hl/diff-hl.el
index 41df9b9eed45439e8a67e9a2967c43afe62782c8,056d300ca766828212c4ec0bd0e88355ba3001ed..056d300ca766828212c4ec0bd0e88355ba3001ed
--- 1/packages/diff-hl/diff-hl.el
--- 2/diff-hl.el
+++ b/packages/diff-hl/diff-hl.el
@@@ -167,14 -167,16 +167,16 @@@
          (puthash key val diff-hl-spec-cache)))\r
      val))\r
  \r
- (defun diff-hl-fringe-bmp-from-pos (type pos)\r
+ (defun diff-hl-fringe-bmp-from-pos (_type pos)\r
    (intern (format "diff-hl-bmp-%s" pos)))\r
  \r
- (defun diff-hl-fringe-bmp-from-type (type pos)\r
+ (defun diff-hl-fringe-bmp-from-type (type _pos)\r
    (if (eq type 'unknown)\r
        'question-mark\r
      (intern (format "diff-hl-bmp-%s" type))))\r
  \r
+ (defvar vc-svn-diff-switches)\r
+ \r
  (defmacro diff-hl-with-diff-switches (body)\r
    `(let ((vc-git-diff-switches nil)\r
           (vc-hg-diff-switches nil)\r