procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

2
lisp/ediff-init.el
View file

@ -1550,7 +1550,7 @@ This default should work without changes."
(defsubst ediff-frame-char-height (frame)
(ediff-cond-compile-for-xemacs-or-emacs
(glyph-height ediff-H-glyph (selected-window frame)) ; xemacs cse
(glyph-height ediff-H-glyph (frame-selected-window frame)) ; xemacs case
(frame-char-height frame) ; emacs case
)
)