Mercurial > emacs
changeset 107029:e760b002759b
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 26 Jan 2010 22:04:51 +0000 |
| parents | 25a4d659d068 (current diff) 40a4dcd1833e (diff) |
| children | c3d6e8003b0d |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jan 25 21:57:27 2010 +0000 +++ b/lisp/ChangeLog Tue Jan 26 22:04:51 2010 +0000 @@ -1,3 +1,7 @@ +2010-01-26 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-hooks.el (vc-path): Mark as obsolete. + 2010-01-25 Dan Nicolaescu <dann@ics.uci.edu> * vc-annotate.el (vc-annotate-revision-at-line): Compare file
--- a/lisp/vc-hooks.el Mon Jan 25 21:57:27 2010 +0000 +++ b/lisp/vc-hooks.el Tue Jan 26 22:04:51 2010 +0000 @@ -89,6 +89,8 @@ :type '(repeat directory) :group 'vc) +(make-obsolete 'vc-path "should not be necessary anymore." "23.2") + (defcustom vc-make-backup-files nil "If non-nil, backups of registered files are made as with other files. If nil (the default), files covered by version control don't get backups."