Source

ediff / ediff-tbar.el

Diff from to

ediff-tbar.el

 (provide 'ediff-tbar)
 
 ;; compiler pacifier
-(defvar ediff-toolbar-icon-directory
-  (if ediff-xemacs-p
-      (or (stringp (locate-data-directory "ediff"))
-	  toolbar-icon-directory))
-    "Where the Ediff toolbar icons are.")
-
 (eval-when-compile
   (let ((load-path (cons (expand-file-name ".") load-path)))
     (or (featurep 'ediff-init)
 
 (require 'ediff-init)
 
+(defvar ediff-toolbar-icon-directory
+  (if ediff-xemacs-p
+      (let ((dir (locate-data-directory "ediff")))
+	(if (stringp dir)
+	    dir
+	  toolbar-icon-directory))
+    "Where the Ediff toolbar icons are."))
+
 (defvar ediff-use-toolbar-p nil
   "If t, Ediff will use a toolbar for the control frame.
 This has an effect only if your emacs supports Toolbars.