summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc/vc-hooks.el2
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4edf3cdd03b..db12be1301f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2012-10-29 Chong Yidong <cyd@gnu.org>
+ * vc/vc-hooks.el (vc-file-clearprops): Kill vc-parent-buffer.
+ Suggested by Dan Nicolaescu (Bug#6326).
+
* info.el (Info-complete-menu-item): Avoid duplicates (Bug#12705).
* startup.el (fancy-about-screen): Don't message (Bug#12680).
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index cac3eb559a1..07a292ae435 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -224,6 +224,8 @@ VC commands are globally reachable under the prefix `\\[vc-prefix-map]':
(defun vc-file-clearprops (file)
"Clear all VC properties of FILE."
+ (if (boundp 'vc-parent-buffer)
+ (kill-local-variable 'vc-parent-buffer))
(setplist (intern file vc-file-prop-obarray) nil))