diff options
| author | Daniel Hackney | 2013-09-04 23:30:07 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-09-04 23:30:07 -0400 |
| commit | 6c42fc3efbbf590fca00b866859fbfa13d34b70a (patch) | |
| tree | 0519b227a10215d99c1bc1373130c993ff93c623 /lisp/vc/ediff-diff.el | |
| parent | 4c528aabaa750d9a4e739dde482b307b734dcd62 (diff) | |
| download | emacs-6c42fc3efbbf590fca00b866859fbfa13d34b70a.tar.gz 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.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.") | |||
| 211 | ;; ediff-setup-diff-regions is called via a funcall to | 211 | ;; ediff-setup-diff-regions is called via a funcall to |
| 212 | ;; ediff-setup-diff-regions-function, which can also have the value | 212 | ;; ediff-setup-diff-regions-function, which can also have the value |
| 213 | ;; ediff-setup-diff-regions3, which takes 4 arguments. | 213 | ;; ediff-setup-diff-regions3, which takes 4 arguments. |
| 214 | (defun ediff-setup-diff-regions (file-A file-B file-C) | 214 | (defun ediff-setup-diff-regions (file-A file-B _file-C) |
| 215 | ;; looking for '-c', '-i', '-u', or 'c', 'i', 'u' among clustered non-long options | 215 | ;; looking for '-c', '-i', '-u', or 'c', 'i', 'u' among clustered non-long options |
| 216 | (if (string-match "^-[ciu]\\| -[ciu]\\|\\(^\\| \\)-[^- ]+[ciu]" | 216 | (if (string-match "^-[ciu]\\| -[ciu]\\|\\(^\\| \\)-[^- ]+[ciu]" |
| 217 | ediff-diff-options) | 217 | ediff-diff-options) |
| @@ -1223,7 +1223,7 @@ delimiter regions")) | |||
| 1223 | ;; like shell-command-sentinel but doesn't print an exit status message | 1223 | ;; like shell-command-sentinel but doesn't print an exit status message |
| 1224 | ;; we do this because diff always exits with status 1, if diffs are found | 1224 | ;; we do this because diff always exits with status 1, if diffs are found |
| 1225 | ;; so shell-command-sentinel displays a confusing message to the user | 1225 | ;; so shell-command-sentinel displays a confusing message to the user |
| 1226 | (defun ediff-process-sentinel (process signal) | 1226 | (defun ediff-process-sentinel (process _signal) |
| 1227 | (if (and (memq (process-status process) '(exit signal)) | 1227 | (if (and (memq (process-status process) '(exit signal)) |
| 1228 | (buffer-name (process-buffer process))) | 1228 | (buffer-name (process-buffer process))) |
| 1229 | (progn | 1229 | (progn |