summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b352d1f884..4834d05c570 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-21 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * vc.el (vc-deduce-fileset): Undo previous change, do not tell
+ vc-responsible-backend to register, it causes problems.
+
2009-10-21 Stefan Monnier <monnier@iro.umontreal.ca>
* help-fns.el: Don't require help-mode (to avoid bootstrap issues).
diff --git a/lisp/vc.el b/lisp/vc.el
index 2d5e325de23..b939c352067 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -933,13 +933,13 @@ current buffer."
((and allow-unregistered (not (vc-registered buffer-file-name)))
(if state-model-only-files
(list (vc-responsible-backend
- (file-name-directory (buffer-file-name)) t)
+ (file-name-directory (buffer-file-name)))
(list buffer-file-name)
(list buffer-file-name)
(when state-model-only-files 'unregistered)
nil)
(list (vc-responsible-backend
- (file-name-directory (buffer-file-name)) t)
+ (file-name-directory (buffer-file-name)))
(list buffer-file-name))))
(t (error "No fileset is available here")))))