Mercurial > hg > xemacs-beta

diff lisp/ediff/custom-load.el @ 187:b405438285a2 r20-3b20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b20
author cvs
date Mon, 13 Aug 2007 09:56:28 +0200
parents 3d6bfa290dbd
children 489f57a838ef
line wrap: on
line diff
--- a/lisp/ediff/custom-load.el	Mon Aug 13 09:55:30 2007 +0200
+++ b/lisp/ediff/custom-load.el	Mon Aug 13 09:56:28 2007 +0200
@@ -1,5 +1,5 @@
-(custom-put 'ediff-diff 'custom-loads '("ediff-diff"))
-(custom-put 'ediff-merge 'custom-loads '("ediff-merg"))
+(custom-put 'ediff 'custom-loads '("ediff-diff" "ediff-merg" "ediff-mult" "ediff-ptch" "ediff-wind" "ediff" "ediff-init"))
+(custom-put 'ediff-ptch 'custom-loads '("ediff-ptch"))
 (custom-put 'ediff-mult 'custom-loads '("ediff-mult"))
-(custom-put 'ediff-ptch 'custom-loads '("ediff-ptch"))
-(custom-put 'ediff 'custom-loads '("ediff-diff" "ediff-merg" "ediff-mult" "ediff-ptch" "ediff-wind" "ediff" "ediff-init"))
+(custom-put 'ediff-merge 'custom-loads '("ediff-merg"))
+(custom-put 'ediff-diff 'custom-loads '("ediff-diff"))