From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 28 Jun 2000 20:19:18 +0000 (+0000)
Subject: (ediff-setup-control-frame): Remove :box
X-Git-Tag: emacs-pretest-21.0.90~3037
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbe14ff4222d2696903e4a501923bbb8fa2a2d24;p=emacs.git

(ediff-setup-control-frame): Remove :box
attribute from mode-line face of Ediff control frame.
---

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 7fec54975b2..5dde883c24b 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -897,7 +897,9 @@ into icons, regardless of the window manager."
       (setq ctl-frame (if (frame-live-p old-ctl-frame)
 			  old-ctl-frame
 			(make-frame ediff-control-frame-parameters))
-	    ediff-control-frame ctl-frame))
+	    ediff-control-frame ctl-frame)
+      (when (and ediff-emacs-p (face-attribute 'mode-line :box))
+	(set-face-attribute 'mode-line ctl-frame :box nil)))
     
     (setq ctl-frame-iconified-p (ediff-frame-iconified-p ctl-frame))
     (select-frame ctl-frame)