Mercurial > emacs
changeset 85838:6852207d73f3
(ediff-file-checked-out-p)
(ediff-file-checked-in-p): Only call vc-locking-user for XEmacs.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 31 Oct 2007 16:16:12 +0000 |
| parents | 07865f189760 |
| children | f32c70475c8e |
| files | lisp/ChangeLog lisp/ediff-util.el |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Oct 31 15:47:02 2007 +0000 +++ b/lisp/ChangeLog Wed Oct 31 16:16:12 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-31 Dan Nicolaescu <dann@ics.uci.edu> + + * ediff-util.el (ediff-file-checked-out-p) + (ediff-file-checked-in-p): Only call vc-locking-user for XEmacs. + 2007-10-31 Stefan Monnier <monnier@iro.umontreal.ca> * abbrev.el (abbrev-symbol): Correct let->let*.
--- a/lisp/ediff-util.el Wed Oct 31 15:47:02 2007 +0000 +++ b/lisp/ediff-util.el Wed Oct 31 16:16:12 2007 +0000 @@ -1141,7 +1141,7 @@ (or (memq (vc-state file) '(edited needs-merge)) (stringp (vc-state file))) ;; XEmacs has no vc-state - (vc-locking-user file)) + (when (featurep 'xemacs) (vc-locking-user file))) ))) (defun ediff-file-checked-in-p (file) @@ -1153,7 +1153,7 @@ (not (memq (vc-state file) '(edited needs-merge))) (not (stringp (vc-state file)))) ;; XEmacs has no vc-state - (not (vc-locking-user file))) + (when (featurep 'xemacs) (not (vc-locking-user file)))) )) (defun ediff-file-compressed-p (file)