aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-04-06 17:30:40 +0000
committerDan Nicolaescu2008-04-06 17:30:40 +0000
commit4dc2220833024c4c40ad52510ec8d6d6f3cf8769 (patch)
treecaa0eafd714a0d5c661dd198c794eb70284633d9
parent312082e9dca5c241c4eb1602674589a2e15d634e (diff)
downloademacs-4dc2220833024c4c40ad52510ec8d6d6f3cf8769.tar.gz
emacs-4dc2220833024c4c40ad52510ec8d6d6f3cf8769.zip
(vc-status-prepare-status-buffer):
Reset vc-parent-buffer-name.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc.el3
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c56fd89c979..6ac5f553f93 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-04-06 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc.el (vc-status-prepare-status-buffer):
4 Reset vc-parent-buffer-name.
5
12008-04-06 Jason Rumney <jasonr@gnu.org> 62008-04-06 Jason Rumney <jasonr@gnu.org>
2 7
3 * language/burmese.el ("Burmese"): Make sample text consistent with 8 * language/burmese.el ("Burmese"): Make sample text consistent with
diff --git a/lisp/vc.el b/lisp/vc.el
index a9c08797538..ec22c49d17b 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2759,6 +2759,9 @@ specific headers."
2759 (with-current-buffer (create-file-buffer bname) 2759 (with-current-buffer (create-file-buffer bname)
2760 (cd dir) 2760 (cd dir)
2761 (vc-setup-buffer (current-buffer)) 2761 (vc-setup-buffer (current-buffer))
2762 ;; Reset the vc-parent-buffer-name so that it does not appear
2763 ;; in the mode-line.
2764 (setq vc-parent-buffer-name nil)
2762 (current-buffer))))) 2765 (current-buffer)))))
2763 2766
2764;;;###autoload 2767;;;###autoload