andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>

Browse source 
* ediff-wind.el (ediff-setup-control-frame): enclose
	face-attribute in condition-case to avoid errors in older emacsen.
This commit is contained in:
Michael Kifer 2000-10-30 02:16:11 +00:00
parent 71070f12e7
commit fda2ce246a
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -22,6 +22,11 @@
programs are modified and moved from mac-win.el.
(mac-roman): Definition of this coding system is modified and
moved from mac-win.el.
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-wind.el (ediff-setup-control-frame): enclose
face-attribute in condition-case to avoid errors in older emacsen.
2000-10-29 Miles Bader <miles@gnu.org>
@ -4793,7 +4798,7 @@
2000-08-28 Peter Breton <pbreton@ne.mediaone.net>
* locate.el (locate): Cleaned up locate command's interactive prompting
Thanks to Fran,Ag(Bois_Pinard <pinard@iro.umontreal.ca> for suggestions.
Thanks to François_Pinard <pinard@iro.umontreal.ca> for suggestions.
* filecache.el (file-cache-case-fold-search): New variable
(file-cache-assoc-function): New variable
@ -8724,7 +8729,7 @@
2000-05-07 Dave Love <fx@gnu.org>
* time.el: Small doc fixes from Pavel Jan,Am(Bk ml.
* time.el: Small doc fixes from Pavel Janík ml.
2000-05-05 Dave Love <fx@gnu.org>

8
lisp/ediff-wind.el
View file

@ -906,8 +906,12 @@ into icons, regardless of the window manager."
old-ctl-frame
(make-frame ediff-control-frame-parameters))
ediff-control-frame ctl-frame)
(when (and ediff-emacs-p (face-attribute 'mode-line :box))
(set-face-attribute 'mode-line ctl-frame :box nil)))
;; protect against undefined face-attribute
(condition-case nill
(when (and ediff-emacs-p (face-attribute 'mode-line :box))
(set-face-attribute 'mode-line ctl-frame :box nil))
(error))
)
(setq ctl-frame-iconified-p (ediff-frame-iconified-p ctl-frame))
(select-frame ctl-frame)