diff options
| author | Dan Nicolaescu <[email protected]> | 2007-10-31 16:16:12 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2007-10-31 16:16:12 +0000 |
| commit | 8ac56013fbde96500613fb57ce38d501a9b7252f (patch) | |
| tree | 76014270f1c06949e2ca74b951a96f93b3301ea0 /lisp/ediff-util.el | |
| parent | 2b86bfb1fd50af27d41aff1034df08be2cdf82b1 (diff) | |
(ediff-file-checked-out-p)
(ediff-file-checked-in-p): Only call vc-locking-user for XEmacs.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 14b1be963d..4583e75479 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) |