Mercurial > emacs
comparison lisp/ediff-util.el @ 33741:798176da5262
(ediff-file-checked-out-p, ediff-file-checked-in-p): Call vc-state
instead of vc-locking-user, which no longer exists.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Wed, 22 Nov 2000 12:54:21 +0000 |
| parents | 25fb6fc4f66b |
| children | be20c22dc16d |
comparison
equal
deleted
inserted
replaced
| 33740:fd29993d1f00 | 33741:798176da5262 |
|---|---|
| 1095 | 1095 |
| 1096 | 1096 |
| 1097 (defsubst ediff-file-checked-out-p (file) | 1097 (defsubst ediff-file-checked-out-p (file) |
| 1098 (or (not (featurep 'vc-hooks)) | 1098 (or (not (featurep 'vc-hooks)) |
| 1099 (and (vc-backend file) | 1099 (and (vc-backend file) |
| 1100 (vc-locking-user file)))) | 1100 (or (memq (vc-state file) '(edited needs-merge)) |
| 1101 (stringp (vc-state file)))))) | |
| 1102 | |
| 1101 (defsubst ediff-file-checked-in-p (file) | 1103 (defsubst ediff-file-checked-in-p (file) |
| 1102 (and (featurep 'vc-hooks) | 1104 (and (featurep 'vc-hooks) |
| 1103 ;; CVS files are considered not checked in | 1105 ;; CVS files are considered not checked in |
| 1104 (not (memq (vc-backend file) '(nil CVS))) | 1106 (not (memq (vc-backend file) '(nil CVS))) |
| 1105 (not (vc-locking-user file)))) | 1107 (not (memq (vc-state file) '(edited needs-merge))) |
| 1108 (not (stringp (vc-state file))))) | |
| 1106 | 1109 |
| 1107 (defun ediff-file-compressed-p (file) | 1110 (defun ediff-file-compressed-p (file) |
| 1108 (condition-case nil | 1111 (condition-case nil |
| 1109 (require 'jka-compr) | 1112 (require 'jka-compr) |
| 1110 (error)) | 1113 (error)) |