diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-10-12 07:13:59 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-10-12 07:13:59 +0000 |
| commit | 2e955a8b51cf21b6f5383ef77cd32d0d58fcabc1 (patch) | |
| tree | f5f1b62b8cdf403e7781941617a26ae1fc4fafcd /lisp/ediff-util.el | |
| parent | d6da15ec7ba78a2c49f4fa4bc2de2d6aee379318 (diff) | |
| download | emacs-2e955a8b51cf21b6f5383ef77cd32d0d58fcabc1.tar.gz | |
2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-init.el (ediff-frame-char-height): use frame-selected-window.
* ediff-util.el (ediff-file-checked-in-p): changed progn with and
* ediff-wind.el (ediff-skip-unsuitable-frames): distinguish selected
frame from frame of selected window
(ediff-frame-has-dedicated-windows): don't select any frames to avoid
changing selected windows
(ediff-setup-control-frame): make sure auto-rase is properly set for
the control frame
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 64d19c5ee69..865f14a41c5 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -1137,9 +1137,9 @@ of the current buffer." ;; CVS files are considered not checked in (not (memq (vc-backend file) '(nil CVS))) (if (fboundp 'vc-state) - (progn - (not (memq (vc-state file) '(edited needs-merge))) - (not (stringp (vc-state file)))) + (and + (not (memq (vc-state file) '(edited needs-merge))) + (not (stringp (vc-state file)))) ;; XEmacs has no vc-state (not (vc-locking-user file))) )) |