summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-merg.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2021-02-26 16:51:15 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2021-02-26 16:51:15 -0500
commit99340ad17a826c61895b3e1ed6928b36fbfeac60 (patch)
treec8dd33d2840c4c5072ba3016a782b48d7d4d40ae /lisp/vc/ediff-merg.el
parent2987376bc358b069ee27f4b0757491f1a8157bf2 (diff)
downloademacs-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-merg.el')
-rw-r--r--lisp/vc/ediff-merg.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index 826cad9cc1b..ad4ef473f84 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -194,7 +194,7 @@ Buffer B."
(defun ediff-set-merge-mode ()
(normal-mode t)
- (remove-hook 'write-file-functions 'ediff-set-merge-mode t))
+ (remove-hook 'write-file-functions #'ediff-set-merge-mode t))
;; Go over all diffs starting with DIFF-NUM and copy regions into buffer C