diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2021-02-26 16:51:15 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2021-02-26 16:51:15 -0500 |
| commit | 99340ad17a826c61895b3e1ed6928b36fbfeac60 (patch) | |
| tree | c8dd33d2840c4c5072ba3016a782b48d7d4d40ae /lisp/vc/ediff-init.el | |
| parent | 2987376bc358b069ee27f4b0757491f1a8157bf2 (diff) | |
| download | emacs-99340ad17a826c61895b3e1ed6928b36fbfeac60.tar.gz | |
lisp/vc/*.el: Use lexical-bindings in all the files
Also remove some redundant `:group` arguments.
* lisp/vc/vc.el (vc-ignore): Autoload.
* lisp/vc/pcvs-util.el (cvs-every, cvs-union, cvs-map): Delete functions.
* lisp/vc/cvs-status.el: Require `cl-lib` at runtime.
(cvs-tree-tags-insert): Use `cl-mapcar` and `cl-every` instead.
* lisp/vc/pcvs.el: Require `cl-lib` at runtime.
(cvs-do-removal): Use `cl-every` instead.
* lisp/vc/ediff-init.el: Require `ediff-util` (for `ediff-cleanup-mess`
and `ediff-default-suspend-function`).
* lisp/vc/pcvs-info.el (cvs-fileinfo<): Remove unused vars `subtypea`
and `subtypeb`.
* lisp/vc/vc-git.el:
* lisp/vc/vc-bzr.el: Require `vc-dispatcher` at runtime for
`vc-do-async-command`.
Diffstat (limited to 'lisp/vc/ediff-init.el')
| -rw-r--r-- | lisp/vc/ediff-init.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 3f33e6aae2e..17c4202d647 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -25,6 +25,7 @@ ;;; Code: (require 'cl-lib) +(require 'ediff-util) ;; Start compiler pacifier (defvar ediff-metajob-name) @@ -1181,8 +1182,8 @@ this variable represents.") (put ediff-fine-diff-face-Ancestor 'ediff-help-echo "A `refinement' of the current difference region") -(add-hook 'ediff-quit-hook 'ediff-cleanup-mess) -(add-hook 'ediff-suspend-hook 'ediff-default-suspend-function) +(add-hook 'ediff-quit-hook #'ediff-cleanup-mess) +(add-hook 'ediff-suspend-hook #'ediff-default-suspend-function) ;;; Overlays @@ -1312,7 +1313,8 @@ This default should work without changes." (defun ediff-paint-background-regions-in-one-buffer (buf-type unhighlight) (let ((diff-vector (eval (ediff-get-symbol-from-alist - buf-type ediff-difference-vector-alist))) + buf-type ediff-difference-vector-alist) + t)) overl diff-num) (mapcar (lambda (rec) (setq overl (ediff-get-diff-overlay-from-diff-record rec) |