diff options
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index ef5032075e6..120228cca84 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -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)) |