aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-hooks.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d06e66e38d3..93f2477b07f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-05-25 Miles Bader <miles@fencepost.gnu.org>
2
3 * vc-hooks.el (vc-find-root): Fix file attribute test.
4
12007-05-24 Richard Stallman <rms@gnu.org> 52007-05-24 Richard Stallman <rms@gnu.org>
2 6
3 * textmodes/flyspell.el (flyspell-correct-word-before-point): 7 * textmodes/flyspell.el (flyspell-correct-word-before-point):
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 1bde704790b..22935ab7f3b 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -325,7 +325,7 @@ If WITNESS if not found, return nil, otherwise return the root."
325 ;; to another user. This should save us from looking in 325 ;; to another user. This should save us from looking in
326 ;; things like /net and /afs. This assumes that all the 326 ;; things like /net and /afs. This assumes that all the
327 ;; files inside a project belong to the same user. 327 ;; files inside a project belong to the same user.
328 (not (equal user (file-attributes file))) 328 (not (equal user (nth 2 (file-attributes file))))
329 (string-match vc-ignore-dir-regexp file))) 329 (string-match vc-ignore-dir-regexp file)))
330 (if (file-exists-p (expand-file-name witness file)) 330 (if (file-exists-p (expand-file-name witness file))
331 (setq root file) 331 (setq root file)