mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-23 14:10:28 -08:00
Code Issues Projects Releases Wiki Activity

2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu>

Browse source 
* 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
This commit is contained in:
Michael Kifer 2002-10-12 07:13:59 +00:00
parent d6da15ec7b
commit 2e955a8b51
4 changed files with 42 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ediff-util.el
View file

@ -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)))
))