# HG changeset patch # User Juanma Barranquero # Date 1208512867 0 # Node ID d03fe9cb1cf4816fd20ab1612b95cf75a774e6be # Parent 17500cca17c46bb9486ad2c2797a5767e9a8e101 (vc-ignore-vc-files, vc-master-templates, vc-header-alist): Add WHEN to obsolescence declaration. (vc-state): Fix typo in docstring. diff -r 17500cca17c4 -r d03fe9cb1cf4 lisp/vc-hooks.el --- a/lisp/vc-hooks.el Fri Apr 18 09:34:30 2008 +0000 +++ b/lisp/vc-hooks.el Fri Apr 18 10:01:07 2008 +0000 @@ -39,16 +39,18 @@ (defvar vc-ignore-vc-files nil) (make-obsolete-variable 'vc-ignore-vc-files - "set `vc-handled-backends' to nil to disable VC.") + "set `vc-handled-backends' to nil to disable VC." + "21.1") (defvar vc-master-templates ()) (make-obsolete-variable 'vc-master-templates "to define master templates for a given BACKEND, use vc-BACKEND-master-templates. To enable or disable VC for a given -BACKEND, use `vc-handled-backends'.") +BACKEND, use `vc-handled-backends'." + "21.1") (defvar vc-header-alist ()) -(make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header) +(make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header "21.1") (defcustom vc-ignore-dir-regexp ;; Stop SMB, automounter, AFS, and DFS host lookups. @@ -518,11 +520,11 @@ 'removed Scheduled to be deleted from the repository on next commit. 'conflict The file contains conflicts as the result of a merge. - For now the conflicts are text conflicts. In the - futures this might be extended to deal with metadata + For now the conflicts are text conflicts. In the + future this might be extended to deal with metadata conflicts too. - 'missing The file is not present in the file system, but the VC + 'missing The file is not present in the file system, but the VC system still tracks it. 'ignored The file showed up in a dir-state listing with a flag