Mercurial > emacs
diff lisp/ediff-util.el @ 93773:d7554c14325c
2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>
* viper*.el (viper-search-wrap-around-t): replace with
viper-search-wrap-around.
* ediff*.el: replace 3-argument 'require' statements with 1-argument
ones (wrapped in if's). For compatibility with the current stable
version of XEmacs.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Sun, 06 Apr 2008 19:26:02 +0000 |
parents | 6523ed37006c |
children | c0dfa9027738 |
line wrap: on
line diff
--- a/lisp/ediff-util.el Sun Apr 06 17:30:40 2008 +0000 +++ b/lisp/ediff-util.el Sun Apr 06 19:26:02 2008 +0000 @@ -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))