[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/04/23 04:05:28

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.590
retrieving revision 1.591
diff -u -b -r1.590 -r1.591
--- vc.el       22 Apr 2008 09:00:14 -0000      1.590
+++ vc.el       23 Apr 2008 04:05:26 -0000      1.591
@@ -1580,9 +1580,19 @@
   (interactive "P")
   (let* ((vc-fileset (vc-deduce-fileset nil t))
         (files (cdr vc-fileset))
-        (state (vc-state (car files)))
-        (model (vc-checkout-model (car files)))
+        state
+        model
         revision)
+    ;; Check if there's at least one file present, and get `state' and
+    ;; `model' from it.
+    ;;FIXME: do something about the case when only directories are
+    ;; present, or `files' is nil.
+    (dolist (file files)
+      (unless (file-directory-p file)
+       (setq model (vc-checkout-model (car files)))
+       (setq state (vc-state file))
+       (return)))
+    
     ;; Verify that the fileset is homogeneous
     (dolist (file (cdr files))
       ;; Ignore directories, they are compatible with anything.