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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/02/24 23:02:10

Index: vc-rcs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-rcs.el,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- vc-rcs.el   19 Feb 2008 11:43:17 -0000      1.60
+++ vc-rcs.el   24 Feb 2008 23:02:09 -0000      1.61
@@ -262,9 +262,11 @@
 
 Automatically retrieve a read-only version of the file with keywords
 expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
-  (let ((subdir (expand-file-name "RCS" (file-name-directory file))))
+  (let (subdir name)
     (dolist (file files)
-      (and (not (file-exists-p subdir))
+      (and (not (file-exists-p
+                (setq subdir (expand-file-name "RCS"
+                                               (file-name-directory file)))))
           (not (directory-files (file-name-directory file)
                                 nil ".*,v$" t))
           (yes-or-no-p "Create RCS subdirectory? ")
@@ -278,10 +280,10 @@
       ;; parse output to find master file name and workfile version
       (with-current-buffer "*vc*"
         (goto-char (point-min))
-        (let ((name (if (looking-at (concat "^\\(.*\\)  <--  "
+       (if (not (setq name
+                      (if (looking-at (concat "^\\(.*\\)  <--  "
                                             (file-name-nondirectory file)))
                         (match-string 1))))
-          (if (not name)
               ;; if we couldn't find the master name,
               ;; run vc-rcs-registered to get it
               ;; (will be stored into the vc-name property)
@@ -296,7 +298,7 @@
                          (if (re-search-forward
                               "^initial revision: \\([0-9.]+\\).*\n"
                               nil t)
-                             (match-string 1)))))))
+                          (match-string 1))))))
 
 (defun vc-rcs-responsible-p (file)
   "Return non-nil if RCS thinks it would be responsible for registering FILE."