(ediff-file-checked-out-p)

(ediff-file-checked-in-p): Only call vc-locking-user for XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb936a3265aca0094875bdecb7e7ea28eaa775f8..d6f8c53df2924e4824a322acd4b4605941ba226e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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*.

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 14b1be963d72722392c3de48910e4b0b792bdfc4..4583e754793a7882280e3647f8baecba8c4fe063 100644 (file)
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -1141,7 +1141,7 @@ of the current buffer."
               (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 @@ of the current buffer."
            (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)