]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4d53e42) | patch
Move a vc option to a preloaded file
authorMauro Aranda <maurooaranda@gmail.com>
Tue, 1 Apr 2025 17:16:02 +0000 (14:16 -0300)
committerEshel Yaron <me@eshelyaron.com>
Thu, 3 Apr 2025 16:50:11 +0000 (18:50 +0200)
commit7a8b364457030cfe89267a3a0c07ee2080ad409c
treec7355a14504dd1709f8487591d6f76487b69f905tree | snapshot
parent4d53e426044bd3760733b6713d5f17133e65a0e3commit | diff
Move a vc option to a preloaded file

Since vc-resolve-conflicts is referenced in backend files, which only
require vc at runtime, move it to vc-hooks to avoid a void
variable error.  (Bug#3860)

* lisp/vc/vc.el (vc-resolve-conflicts): Move from here...
* lisp/vc/vc-hooks.el (vc-resolve-conflicts): ...to here.

(cherry picked from commit 883355cef7c758067b49f50ab98cc5516da55155)
lisp/vc/vc-hooks.el diff | blob | history
lisp/vc/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.