diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-04-06 19:26:02 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-04-06 19:26:02 +0000 |
| commit | a5254f378911515c8b19ac4d4be0877c835f1586 (patch) | |
| tree | 94316ba0dfc2cfb7c44e6859b6810916bf34bc3f /lisp/ediff-wind.el | |
| parent | 4dc2220833024c4c40ad52510ec8d6d6f3cf8769 (diff) | |
| download | emacs-a5254f378911515c8b19ac4d4be0877c835f1586.tar.gz | |
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.
Diffstat (limited to 'lisp/ediff-wind.el')
| -rw-r--r-- | lisp/ediff-wind.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index e094c15bdfe..abbcd09521e 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -49,7 +49,8 @@ (require 'ediff-init) (require 'ediff-util) (require 'ediff-help) - (require 'ediff-tbar nil 'noerror) + (if (featurep 'xemacs) + (require 'ediff-tbar)) ) ;; end pacifier @@ -57,10 +58,7 @@ ;; be careful with ediff-tbar (if (featurep 'xemacs) - (condition-case nil - (require 'ediff-tbar) - (error - (defun ediff-compute-toolbar-width () 0))) + (require 'ediff-tbar) (defun ediff-compute-toolbar-width () 0)) (defgroup ediff-window nil |