[elpa] scratch/add-vdiff c32fe46 251/258: vdiff: Fix compiler warnings

[Justin Burkett]

branch: scratch/add-vdiff
commit c32fe46ad8362b4d918e194cca5ef84dd09981bf
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>

    vdiff: Fix compiler warnings
---
 vdiff.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index f98de64..6a7fc11 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1746,7 +1746,7 @@ function for ON-QUIT to do something useful with the 
result."
     (vdiff-refresh #'vdiff--scroll-function)))
 
 ;;;###autoload
-(defun vdiff-merge-conflict (file &optional on-quit restore-windows-on-quit)
+(defun vdiff-merge-conflict (file &optional restore-windows-on-quit)
   "Start vdiff session using merge conflicts marked in FILE."
   (interactive (list buffer-file-name))
   (with-current-buffer (find-file-noselect file)
@@ -1817,7 +1817,7 @@ function for ON-QUIT to do something useful with the 
result."
           (when (buffer-live-p mine) (kill-buffer mine))
           (when (buffer-live-p ,ancestor) (kill-buffer ,ancestor))
           (when (buffer-live-p other) (kill-buffer other)))
-       t))))
+       restore-windows-on-quit))))
 
 ;;;###autoload
 (defun vdiff-files3 (file-a file-b file-c &optional on-quit)
@@ -1880,7 +1880,7 @@ nothing to revert then this command fails."
       (funcall current-major))
     (vdiff-buffers revert-buf (current-buffer)
                    nil
-                   (lambda (rbuf cbuf)
+                   (lambda (rbuf _)
                      (when (buffer-live-p rbuf)
                        (kill-buffer rbuf)))
                    t)))