procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(vc-rcs-register): Fix treatment of directories in multiple file case.

Browse source 
Use a single `let' rather than two.
This commit is contained in:
Glenn Morris 2008-02-24 23:02:59 +00:00
parent 967bf29791
commit 09607e62d9
2 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -5,6 +5,9 @@
* vc-mcvs.el (vc-mcvs-register): Fix let-binding (for use of `file').
* vc-rcs.el (vc-rcs-register): Fix treatment of directories in
multiple file case. Use a single `let' rather than two.
2008-02-24 Dan Nicolaescu <dann@ics.uci.edu>
* progmodes/compile.el (compilation-start): Specify a face for

46
lisp/vc-rcs.el
View file

@ -262,9 +262,11 @@ the RCS command (in that order).
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? ")
@ -277,26 +279,26 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
(vc-switches 'RCS 'register))
;; parse output to find master file name and workfile version
(with-current-buffer "*vc*"
(goto-char (point-min))
(let ((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)
(vc-rcs-registered file)
(vc-file-setprop file 'vc-name
(if (file-name-absolute-p name)
name
(expand-file-name
name
(file-name-directory file))))))
(vc-file-setprop file 'vc-working-revision
(if (re-search-forward
"^initial revision: \\([0-9.]+\\).*\n"
nil t)
(match-string 1)))))))
(goto-char (point-min))
(if (not (setq name
(if (looking-at (concat "^\\(.*\\) <-- "
(file-name-nondirectory file)))
(match-string 1))))
;; if we couldn't find the master name,
;; run vc-rcs-registered to get it
;; (will be stored into the vc-name property)
(vc-rcs-registered file)
(vc-file-setprop file 'vc-name
(if (file-name-absolute-p name)
name
(expand-file-name
name
(file-name-directory file))))))
(vc-file-setprop file 'vc-working-revision
(if (re-search-forward
"^initial revision: \\([0-9.]+\\).*\n"
nil t)
(match-string 1))))))
(defun vc-rcs-responsible-p (file)
"Return non-nil if RCS thinks it would be responsible for registering FILE."