summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-10-29 19:12:17 +0800
committerChong Yidong <cyd@gnu.org>2012-10-29 19:12:17 +0800
commit1dc2755a716e15ac6b21d1f070346954d58018ef (patch)
tree61a999e22f8d9fe68b071b541220dca969d6afcc /lisp
parent329c48d8b26a8943ee47682916f83f4fb60f608e (diff)
downloademacs-1dc2755a716e15ac6b21d1f070346954d58018ef.tar.gz
* vc/vc-hooks.el (vc-file-clearprops): Kill vc-parent-buffer.
Suggested by Dan Nicolaescu. Fixes: debbugs:6326
Diffstat (limited to 'lisp')
-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))