diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-10-30 02:16:11 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-10-30 02:16:11 +0000 |
| commit | fda2ce246adf7e469334877d861e7f21e72b4b61 (patch) | |
| tree | 146653914f161ca16e1989d4378346188dee9ec0 /lisp/ediff-wind.el | |
| parent | 71070f12e7355ba3939e0273a140591a2d0189d5 (diff) | |
| download | emacs-fda2ce246adf7e469334877d861e7f21e72b4b61.tar.gz | |
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.
Diffstat (limited to 'lisp/ediff-wind.el')
| -rw-r--r-- | lisp/ediff-wind.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index cfebeb2b919..4e8138a087b 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -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) |