(selection_request_dpyinfo): New variable.

[bpt/emacs.git] / lisp / ediff-wind.el

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index cfebeb2..46d5659 100644 (file)
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -151,6 +151,7 @@ In this case, Ediff will use those frames to display these buffers."
    '(vertical-scroll-bars . nil)  ; Emacs only
    '(scrollbar-width . 0)         ; XEmacs only
    '(menu-bar-lines . 0)          ; Emacs only
+   '(tool-bar-lines . 0)          ; Emacs 21+ only
    ;; don't lower and auto-raise
    '(auto-lower . nil)
    '(auto-raise . t)
@@ -841,9 +842,6 @@ into icons, regardless of the window manager."
                    (or
                     (ediff-frame-has-dedicated-windows (selected-frame))
                     (ediff-frame-iconified-p (selected-frame))
-                    ;; skip small frames
-                    (< (frame-height (selected-frame))
-                       (* 3 window-min-height))
                     ;; skip small windows
                     (< (window-height (selected-window))
                        (* 3 window-min-height))
@@ -906,8 +904,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)