Commits

Anonymous committed 415086b

Don't assume unconditional X11/Toolbar support

  • Participants
  • Parent commits d886586

Comments (0)

Files changed (3)

+1998-12-09  SL Baur  <steve@altair.xemacs.org>
+
+	* ediff-tbar.el (ediff-toolbar-icon-directory): Don't assume there 
+	is always toolbar support.
+
 Thu Oct  8 04:22:52 1998  Michael Kifer  <kifer@cs.sunysb.edu> 
  
         * ediff-util.el (ediff-cleanup-mess): fixed the case of dead windows. 
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 1.14
+VERSION = 1.15
 AUTHOR_VERSION = 2.71
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = ediff
 (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