Mercurial > emacs
comparison lisp/vc.el @ 9216:8aae61dee4df
(vc-register): Verify an old master file really still exists
before giving error. If it has disappeared, ask for confirmation.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 02 Oct 1994 01:49:29 +0000 |
| parents | 09fb6d81f449 |
| children | 909ae53a446d |
comparison
equal
deleted
inserted
replaced
| 9215:fa3883c219ea | 9216:8aae61dee4df |
|---|---|
| 498 | 498 |
| 499 ;;;###autoload | 499 ;;;###autoload |
| 500 (defun vc-register (&optional override comment) | 500 (defun vc-register (&optional override comment) |
| 501 "Register the current file into your version-control system." | 501 "Register the current file into your version-control system." |
| 502 (interactive "P") | 502 (interactive "P") |
| 503 (if (vc-name buffer-file-name) | 503 (let ((master (vc-name buffer-file-name))) |
| 504 (error "This file is already registered")) | 504 (and master (file-exists-p master) |
| 505 (error "This file is already registered")) | |
| 506 (and master | |
| 507 (not (y-or-n-p "Previous master file has vanished. Make a new one? ")) | |
| 508 (error "This file is already registered"))) | |
| 505 ;; Watch out for new buffers of size 0: the corresponding file | 509 ;; Watch out for new buffers of size 0: the corresponding file |
| 506 ;; does not exist yet, even though buffer-modified-p is nil. | 510 ;; does not exist yet, even though buffer-modified-p is nil. |
| 507 (if (and (not (buffer-modified-p)) | 511 (if (and (not (buffer-modified-p)) |
| 508 (zerop (buffer-size)) | 512 (zerop (buffer-size)) |
| 509 (not (file-exists-p buffer-file-name))) | 513 (not (file-exists-p buffer-file-name))) |