Mercurial > emacs

diff lisp/ediff-wind.el @ 21940:f7e788ea680b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new version
author Michael Kifer <kifer@cs.stonybrook.edu>
date Mon, 04 May 1998 22:42:59 +0000
parents f90d40b0bff5
children 4f315ca65976
line wrap: on
line diff
--- a/lisp/ediff-wind.el	Mon May 04 22:33:38 1998 +0000
+++ b/lisp/ediff-wind.el	Mon May 04 22:42:59 1998 +0000
@@ -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 @@
     
     ;; 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)