diff options
| author | Lute Kamstra | 2008-12-04 18:10:34 +0000 |
|---|---|---|
| committer | Lute Kamstra | 2008-12-04 18:10:34 +0000 |
| commit | fcb61bee01d80856f959a93c9158254256dc7e49 (patch) | |
| tree | 821a1d7624b22b8a9f544f598c83a65993825ef2 | |
| parent | bf6bfba823f6dc263dc7cd12580dc95a0bc49eab (diff) | |
| download | emacs-fcb61bee01d80856f959a93c9158254256dc7e49.tar.gz emacs-fcb61bee01d80856f959a93c9158254256dc7e49.zip | |
(vc-cvs-could-register): Don't use file-directory-p to
check if the file "CVS/Entries" exists.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-cvs.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 97f20b906eb..0699978fb95 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-12-04 Lute Kamstra <lute@gnu.org> | ||
| 2 | |||
| 3 | * vc-cvs.el (vc-cvs-could-register): Don't use file-directory-p to | ||
| 4 | check if the file "CVS/Entries" exists. | ||
| 5 | |||
| 1 | 2008-12-04 Juanma Barranquero <lekktu@gmail.com> | 6 | 2008-12-04 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * international/mule-diag.el (list-character-sets): Doc fix. | 8 | * international/mule-diag.el (list-character-sets): Doc fix. |
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index fec6e2f7a58..813ef0c146d 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el | |||
| @@ -306,9 +306,10 @@ its parents." | |||
| 306 | (while (and (stringp dir) | 306 | (while (and (stringp dir) |
| 307 | (not (equal dir (setq dir (file-name-directory dir)))) | 307 | (not (equal dir (setq dir (file-name-directory dir)))) |
| 308 | dir) | 308 | dir) |
| 309 | (setq dir (if (file-directory-p | 309 | (setq dir (if (file-exists-p |
| 310 | (expand-file-name "CVS/Entries" dir)) | 310 | (expand-file-name "CVS/Entries" dir)) |
| 311 | t (directory-file-name dir)))) | 311 | t |
| 312 | (directory-file-name dir)))) | ||
| 312 | (eq dir t))) | 313 | (eq dir t))) |
| 313 | 314 | ||
| 314 | (defun vc-cvs-checkin (files rev comment) | 315 | (defun vc-cvs-checkin (files rev comment) |