# HG changeset patch
# User Michael Kifer <kifer@cs.stonybrook.edu>
# Date 972872171 0
# Node ID 84f89d78d87a4e4e8e403ac9a8c6ec383a5cd1f3
# Parent  fed8d1ebdc15c1d90006824927e9283b6ae58295
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.

diff -r fed8d1ebdc15 -r 84f89d78d87a lisp/ChangeLog
--- 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>
 
diff -r fed8d1ebdc15 -r 84f89d78d87a lisp/ediff-wind.el
--- 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)