From: Michael Kifer <kifer@cs.stonybrook.edu>
Date: Mon, 30 Oct 2000 02:16:11 +0000 (+0000)
Subject: 2000-10-29  Michael Kifer  <kifer@cs.sunysb.edu>
X-Git-Tag: emacs-pretest-21.0.90~427
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fda2ce246adf7e469334877d861e7f21e72b4b61;p=emacs.git

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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e5ba70d9b9..96748d3a426 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --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)