procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move a vc option to a preloaded file

Browse source 
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.
This commit is contained in:
Mauro Aranda 2025-04-01 14:16:02 -03:00
parent 975d58c4c8
commit 883355cef7
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/vc/vc-hooks.el
View file

@ -168,6 +168,21 @@ revision number and lock status."
:type 'boolean
:group 'vc)
(defcustom vc-resolve-conflicts t
"Whether to mark conflicted file as resolved upon saving.
If this is non-nil and there are no more conflict markers in the file,
VC will mark the conflicts in the saved file as resolved. This is
only meaningful for VCS that handle conflicts by inserting conflict
markers in a conflicted file.
When saving a conflicted file, VC first tries to use the value
of `vc-BACKEND-resolve-conflicts', for handling backend-specific
settings. It defaults to this option if that option has the special
value `default'."
:type 'boolean
:version "31.1")
;;; This is handled specially now.
;; Tell Emacs about this new kind of minor mode
;; (add-to-list 'minor-mode-alist '(vc-mode vc-mode))

15
lisp/vc/vc.el
View file

@ -999,21 +999,6 @@ the URL-REGEXP of the association."
:value-type ,vc-cloneable-backends-custom-type)
:version "31.1")
(defcustom vc-resolve-conflicts t
"Whether to mark conflicted file as resolved upon saving.
If this is non-nil and there are no more conflict markers in the file,
VC will mark the conflicts in the saved file as resolved. This is
only meaningful for VCS that handle conflicts by inserting conflict
markers in a conflicted file.
When saving a conflicted file, VC first tries to use the value
of `vc-BACKEND-resolve-conflicts', for handling backend-specific
settings. It defaults to this option if that option has the special
value `default'."
:type 'boolean
:version "31.1")
;; File property caching