aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/vc-hooks.el14
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 7f1806168cd..a812443f004 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -39,16 +39,18 @@
39 39
40(defvar vc-ignore-vc-files nil) 40(defvar vc-ignore-vc-files nil)
41(make-obsolete-variable 'vc-ignore-vc-files 41(make-obsolete-variable 'vc-ignore-vc-files
42 "set `vc-handled-backends' to nil to disable VC.") 42 "set `vc-handled-backends' to nil to disable VC."
43 "21.1")
43 44
44(defvar vc-master-templates ()) 45(defvar vc-master-templates ())
45(make-obsolete-variable 'vc-master-templates 46(make-obsolete-variable 'vc-master-templates
46 "to define master templates for a given BACKEND, use 47 "to define master templates for a given BACKEND, use
47vc-BACKEND-master-templates. To enable or disable VC for a given 48vc-BACKEND-master-templates. To enable or disable VC for a given
48BACKEND, use `vc-handled-backends'.") 49BACKEND, use `vc-handled-backends'."
50 "21.1")
49 51
50(defvar vc-header-alist ()) 52(defvar vc-header-alist ())
51(make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header) 53(make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header "21.1")
52 54
53(defcustom vc-ignore-dir-regexp 55(defcustom vc-ignore-dir-regexp
54 ;; Stop SMB, automounter, AFS, and DFS host lookups. 56 ;; Stop SMB, automounter, AFS, and DFS host lookups.
@@ -518,11 +520,11 @@ For registered files, the value returned is one of:
518 'removed Scheduled to be deleted from the repository on next commit. 520 'removed Scheduled to be deleted from the repository on next commit.
519 521
520 'conflict The file contains conflicts as the result of a merge. 522 'conflict The file contains conflicts as the result of a merge.
521 For now the conflicts are text conflicts. In the 523 For now the conflicts are text conflicts. In the
522 futures this might be extended to deal with metadata 524 future this might be extended to deal with metadata
523 conflicts too. 525 conflicts too.
524 526
525 'missing The file is not present in the file system, but the VC 527 'missing The file is not present in the file system, but the VC
526 system still tracks it. 528 system still tracks it.
527 529
528 'ignored The file showed up in a dir-state listing with a flag 530 'ignored The file showed up in a dir-state listing with a flag