Mercurial > emacs
changeset 33050:84f89d78d87a
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.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Mon, 30 Oct 2000 02:16:11 +0000 |
| parents | fed8d1ebdc15 |
| children | d1e7886acdb7 |
| files | lisp/ChangeLog lisp/ediff-wind.el |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Oct 30 01:37:20 2000 +0000 +++ b/lisp/ChangeLog Mon Oct 30 02:16:11 2000 +0000 @@ -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>
--- a/lisp/ediff-wind.el Mon Oct 30 01:37:20 2000 +0000 +++ b/lisp/ediff-wind.el Mon Oct 30 02:16:11 2000 +0000 @@ -906,8 +906,12 @@ 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)