Source

ediff / ediff-tbar.el

Diff from to

ediff-tbar.el

 (require 'ediff-init)
 
 (defvar ediff-toolbar-icon-directory
-  (if ediff-xemacs-p
+  (if (and ediff-xemacs-p (featurep 'toolbar))
       (let ((dir (locate-data-directory "ediff")))
 	(if (stringp dir)
 	    dir