summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-diff.el
diff options
context:
space:
mode:
authorDaniel Hackney <dan@haxney.org>2013-09-04 23:30:07 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-09-04 23:30:07 -0400
commit6c42fc3efbbf590fca00b866859fbfa13d34b70a (patch)
tree0519b227a10215d99c1bc1373130c993ff93c623 /lisp/vc/ediff-diff.el
parent4c528aabaa750d9a4e739dde482b307b734dcd62 (diff)
downloademacs-6c42fc3efbbf590fca00b866859fbfa13d34b70a.tar.gz
emacs-6c42fc3efbbf590fca00b866859fbfa13d34b70a.tar.bz2
emacs-6c42fc3efbbf590fca00b866859fbfa13d34b70a.zip
* lisp/dired-x.el:
* lisp/net/ange-ftp.el: * lisp/net/browse-url.el: * lisp/net/dbus.el: * lisp/net/eudc.el: * lisp/net/eudcb-ldap.el: * lisp/net/eww.el: * lisp/net/imap.el: * lisp/printing.el: * lisp/vc/ediff-diff.el: * lisp/vc/ediff-init.el: * lisp/vc/ediff-merg.el: * lisp/vc/ediff-mult.el: * lisp/vc/ediff-util.el: * lisp/vc/ediff-wind.el: * lisp/vc/ediff.el: * lisp/vc/emerge.el: * lisp/vc/pcvs.el: * vc/vc-annotate.el: Prefix unused arguments with `_' to silence byte compiler. Remove some unused let-bound variables.
Diffstat (limited to 'lisp/vc/ediff-diff.el')
-rw-r--r--lisp/vc/ediff-diff.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index 3e64250d1a7..3f0ef3a7a61 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -211,7 +211,7 @@ one optional arguments, diff-number to refine.")
;; ediff-setup-diff-regions is called via a funcall to
;; ediff-setup-diff-regions-function, which can also have the value
;; ediff-setup-diff-regions3, which takes 4 arguments.
-(defun ediff-setup-diff-regions (file-A file-B file-C)
+(defun ediff-setup-diff-regions (file-A file-B _file-C)
;; looking for '-c', '-i', '-u', or 'c', 'i', 'u' among clustered non-long options
(if (string-match "^-[ciu]\\| -[ciu]\\|\\(^\\| \\)-[^- ]+[ciu]"
ediff-diff-options)
@@ -1223,7 +1223,7 @@ delimiter regions"))
;; like shell-command-sentinel but doesn't print an exit status message
;; we do this because diff always exits with status 1, if diffs are found
;; so shell-command-sentinel displays a confusing message to the user
-(defun ediff-process-sentinel (process signal)
+(defun ediff-process-sentinel (process _signal)
(if (and (memq (process-status process) '(exit signal))
(buffer-name (process-buffer process)))
(progn