Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
93772:061a2121a7e8 | 93773:d7554c14325c |
---|---|
55 (require 'ediff-wind) | 55 (require 'ediff-wind) |
56 (if (not (featurep 'ediff-diff)) | 56 (if (not (featurep 'ediff-diff)) |
57 (require 'ediff-diff)) | 57 (require 'ediff-diff)) |
58 (require 'ediff-merg) | 58 (require 'ediff-merg) |
59 (require 'ediff) | 59 (require 'ediff) |
60 (require 'ediff-tbar nil 'noerror) | 60 ;; for compatibility with current stable version of xemacs |
61 (if (featurep 'xemacs) | |
62 (require 'ediff-tbar)) | |
61 ) | 63 ) |
62 ;; end pacifier | 64 ;; end pacifier |
63 | 65 |
64 | 66 |
65 (require 'ediff-init) | 67 (require 'ediff-init) |
67 (require 'ediff-mult) | 69 (require 'ediff-mult) |
68 (require 'ediff-wind) | 70 (require 'ediff-wind) |
69 (require 'ediff-diff) | 71 (require 'ediff-diff) |
70 (require 'ediff-merg) | 72 (require 'ediff-merg) |
71 | 73 |
74 ;; for compatibility with current stable version of xemacs | |
72 (if (featurep 'xemacs) | 75 (if (featurep 'xemacs) |
73 (require 'ediff-tbar)) | 76 (require 'ediff-tbar)) |
74 | 77 |
75 | 78 |
76 ;;; Functions | 79 ;;; Functions |