diff options
Diffstat (limited to 'lisp/vc/ediff-init.el')
| -rw-r--r-- | lisp/vc/ediff-init.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 075775923a5..c9f3583a437 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -810,7 +810,7 @@ TYPE-OF-EMACS is either 'xemacs or 'emacs." (ediff-overlay-put extent 'face face) (ediff-overlay-put extent 'help-echo 'ediff-region-help-echo)) -(defun ediff-region-help-echo (extent-or-window &optional overlay point) +(defun ediff-region-help-echo (extent-or-window &optional overlay _point) (unless overlay (setq overlay extent-or-window)) (let ((is-current (ediff-overlay-get overlay 'ediff)) @@ -1768,7 +1768,7 @@ Unless optional argument INPLACE is non-nil, return a new string." (or n (setq n ediff-current-difference)) (and (>= n 0) (< n ediff-number-of-differences))) -(defsubst ediff-show-all-diffs (n) +(defsubst ediff-show-all-diffs (_n) "Don't skip difference regions." nil) |