From d031f2c7b72ba418abc4bc9622a25bd4fa7d8a6c Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 22 Dec 2011 18:16:45 +0800 Subject: [PATCH] * vc/vc-hooks.el (vc-keep-workfiles): Doc fix. --- lisp/ChangeLog | 4 ++++ lisp/vc/vc-hooks.el | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2cf35375245..0ecab2b569c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-12-22 Chong Yidong + + * vc/vc-hooks.el (vc-keep-workfiles): Doc fix. + 2011-12-21 Drew Adams * files.el (file-remote-p): Fix docstring. (Bug#10319) diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 148f6cde930..c9e30772318 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -114,9 +114,9 @@ Otherwise, not displayed." :group 'vc) (defcustom vc-keep-workfiles t - "If non-nil, don't delete working files after registering changes. -If the back-end is CVS, workfiles are always kept, regardless of the -value of this flag." + "Whether to keep work files on disk after commits, on a locking VCS. +This variable has no effect on modern merging-based version +control systems." :type 'boolean :group 'vc) -- 2.39.2