[Emacs-diffs] Changes to emacs/lisp/ediff-util.el,v

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   08/04/06 19:26:05

Index: ediff-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- ediff-util.el       4 Apr 2008 07:51:25 -0000       1.88
+++ ediff-util.el       6 Apr 2008 19:26:02 -0000       1.89
@@ -57,7 +57,9 @@
       (require 'ediff-diff))
   (require 'ediff-merg)
   (require 'ediff)
-  (require 'ediff-tbar nil 'noerror)
+  ;; for compatibility with current stable version of xemacs
+  (if (featurep 'xemacs)
+      (require 'ediff-tbar))
   )
 ;; end pacifier
 
@@ -69,6 +71,7 @@
 (require 'ediff-diff)
 (require 'ediff-merg)
 
+;; for compatibility with current stable version of xemacs
 (if (featurep 'xemacs)
     (require 'ediff-tbar))