[Emacs-diffs] Changes to emacs/lisp/ediff-util.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/10/31 16:16:14

Index: ediff-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- ediff-util.el       25 Sep 2007 10:48:16 -0000      1.75
+++ ediff-util.el       31 Oct 2007 16:16:12 -0000      1.76
@@ -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)