Mercurial > hg > xemacs-beta

diff lisp/ediff/custom-load.el @ 177:6075d714658b r20-3b15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b15
author cvs
date Mon, 13 Aug 2007 09:51:16 +0200
parents 2d532a89d707
children e121b013d1f0
line wrap: on
line diff
--- a/lisp/ediff/custom-load.el	Mon Aug 13 09:50:16 2007 +0200
+++ b/lisp/ediff/custom-load.el	Mon Aug 13 09:51:16 2007 +0200
@@ -1,6 +1,6 @@
-(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-window 'custom-loads '())
+(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-window 'custom-loads '())
-(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"))