2 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 362f46616f6..55c3862aefa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-31  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc-svn.el (vc-svn-dir-status): Disable the vc-stay-local-p
+        logic, it makes the makes the normal case too slow.
+
 2009-01-31  Eli Zaretskii  <eliz@gnu.org>
 
         * mail/unrmail.el (unrmail): Set coding-system of the old Rmail
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index cfbc8496433..c2d0d62ab6c 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -185,8 +185,12 @@ want to force an empty list of arguments, use t."
 CALLBACK is called as (CALLBACK RESULT BUFFER), where
 RESULT is a list of conses (FILE . STATE) for directory DIR."
   ;; FIXME should this rather be all the files in dir?
-  (let* ((local (vc-stay-local-p dir))
-         (remote (or (not local) (eq local 'only-file))))
+  ;; FIXME: the vc-stay-local-p logic below is disabled, it ends up
+  ;; calling synchronously (vc-svn-registered DIR) => calling svn status -v DIR
+  ;; which is VERY SLOW for big trees and it makes emacs
+  ;; completely unresponsive during that time.
+  (let* ((local (and nil (vc-stay-local-p dir)))
+         (remote (or t (not local) (eq local 'only-file))))
     (vc-svn-command (current-buffer) 'async nil "status"
                     (if remote "-u"))
   (vc-exec-after