(ebrowse-tree-mode-map): Use display-mouse-p instead of window-system.

[gnu-emacs] / lisp / ediff-wind.el

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 7fec54975b2b321b29393b3599b06e71b54a28be..5dde883c24b239f5ba8990ee5eabe86f0d9ef508 100644 (file)
--- 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)