Address an edge case in vc-diff. This is an experimental fix and may change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af7283ec15cf130424d75f3ab46353a2a1de073b..a9cb2da7056c555ee97b94f0f3e9e5c268fe8586 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,9 @@
 
 2007-10-11  Eric S. Raymond  <esr@snark.thyrsus.com>
 
+       * vc.el: Address an edge case in vc-diff pointed out by  
+       Juanma Barranquero.  This is an experimental fix and may change.
+
        * vc-hooks.el (vc-registered): Robustify this function a bit
        against filenames with no directory component.
 

diff --git a/lisp/vc.el b/lisp/vc.el
index 5505b13e49bb04d6f1c54e1bdd0715324ff665bc..932f221a07707e10e25a050dd42cf6210345fa78 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1985,24 +1985,41 @@ returns t if the buffer had changes, nil otherwise."
       (error "Not a valid revision range."))
   (vc-diff-internal backend t files rev1 rev2 (interactive-p)))
 
+(defun vc-contains-version-controlled-file (dir)
+  "Return t if DIR contains a version-controlled file, nil otherwise."
+  (catch 'found
+    (mapc (lambda (f) (and (not (file-directory-p f)) (vc-backend f) (throw 'found 't))) (directory-files dir))
+    nil))
+
 ;;;###autoload
 (defun vc-diff (historic)
   "Display diffs between file revisions.
-Normally this compares the current file and buffer with the most
-recent checked in revision of that file.  This uses no arguments.  With
-a prefix argument HISTORIC, it reads the file name to use and two
-revision designators specifying which revisions to compare."
+Normally this compares the currently selected fileset with their
+working revisions. With a prefix argument HISTORIC, it reads two revision
+designators specifying which revisions to compare.
+
+If no current fileset is available (that is, we are not in
+VC-Dired mode and the visited file of the current buffer is not
+under version control) behave specially; if there are
+version-controlled files in the current directory, treat all
+version-controlled files recursively beneath the current
+directory as the selected fileset.
+"
+
   (interactive "P")
-  (if historic
-      (call-interactively 'vc-history-diff)
-    (let* ((files (vc-deduce-fileset t))
-          (first (car files))
-          (backend 
-           (cond ((file-directory-p first)
-                  (vc-responsible-backend first))
-                 (t
-                  (vc-backend first)))))
-      (vc-diff-internal backend t files nil nil (interactive-p)))))
+  (cond ((not (vc-contains-version-controlled-file default-directory))
+        (error "No version-controlled files directly beneath default directory"))
+       (historic
+        (call-interactively 'vc-history-diff))
+       (t
+        (let* ((files (vc-deduce-fileset t))
+               (first (car files))
+               (backend 
+                (cond ((file-directory-p first)
+                       (vc-responsible-backend first))
+                      (t
+                       (vc-backend first)))))
+          (vc-diff-internal backend t files nil nil (interactive-p))))))
 
 ;;;###autoload
 (defun vc-revision-other-window (rev)