From 8ac56013fbde96500613fb57ce38d501a9b7252f Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Wed, 31 Oct 2007 16:16:12 +0000 Subject: [PATCH] (ediff-file-checked-out-p) (ediff-file-checked-in-p): Only call vc-locking-user for XEmacs. --- lisp/ChangeLog | 5 +++++ lisp/ediff-util.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cb936a3265a..d6f8c53df29 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-10-31 Dan Nicolaescu + + * 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 * abbrev.el (abbrev-symbol): Correct let->let*. diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 14b1be963d7..4583e754793 100644 --- 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) -- 2.11.4.GIT