diff options
Diffstat (limited to 'lisp/ediff-wind.el')
| -rw-r--r-- | lisp/ediff-wind.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index e5edc2f08f5..dde68ed1f31 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -46,6 +46,7 @@ (or (featurep 'ediff-help) (load "ediff-help.el" nil nil 'nosuffix)) (or (featurep 'ediff-tbar) + ediff-emacs-p (load "ediff-tbar.el" 'noerror nil 'nosuffix)) )) ;; end pacifier @@ -932,7 +933,7 @@ into icons, regardless of the window manager." ;; In XEmacs, buffer menubar needs to be killed before frame parameters ;; are changed. - (if ediff-xemacs-p + (if (ediff-has-toolbar-support-p) (progn (set-specifier top-toolbar-height (list ctl-frame 2)) (sit-for 0) |