[Emacs-diffs] Changes to emacs/lisp/vc-hooks.el,v

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/04/18 10:01:07

Index: vc-hooks.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-hooks.el,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -b -r1.237 -r1.238
--- vc-hooks.el 16 Apr 2008 00:57:12 -0000      1.237
+++ vc-hooks.el 18 Apr 2008 10:01:07 -0000      1.238
@@ -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.
@@ -519,7 +521,7 @@
 
   '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
+                     future this might be extended to deal with metadata
                      conflicts too.
 
   'missing           The file is not present in the file system, but the VC