diff options
Diffstat (limited to 'lisp/vc/ediff-diff.el')
| -rw-r--r-- | lisp/vc/ediff-diff.el | 4 |
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 |