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)

diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 401ccb066e0bfbd455cef9fd1267e81121adfdc9..f9fa3e1bd7ee7097f0997ed2dc05f1c677941e2f 100644 (file)
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -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))

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 8fb764ea851fb31e3aeb758d899c54cdec8ad0d4..226ed5e95fb0a5a46913f6c0c2bff91b7a3d8114 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -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")
-
 \f
 ;; File property caching