--- a/lisp/prim/custom-load.el	Mon Aug 13 09:35:15 2007 +0200
+++ b/lisp/prim/custom-load.el	Mon Aug 13 09:36:16 2007 +0200
@@ -29,7 +29,7 @@
 (put 'telnet 'custom-loads '("telnet"))
 (put 'widgets 'custom-loads '("wid-browse" "wid-edit"))
 (put 'minibuffer 'custom-loads '("minibuf" "detached-minibuf"))
-(put 'environment 'custom-loads '("minibuf" "modeline" "x-toolbar" "cus-edit" "dired-faces" "sound"))
+(put 'environment 'custom-loads '("minibuf" "modeline" "x-toolbar" "cus-edit" "dired-faces" "gnuserv" "sound"))
 (put 'shell 'custom-loads '("shell"))
 (put 'sound 'custom-loads '("sound"))
 (put 'gnus-article-buttons 'custom-loads '("gnus-art"))
@@ -53,7 +53,7 @@
 (put 'xrdb 'custom-loads '("xrdb-mode"))
 (put 'gnus-article-washing 'custom-loads '("gnus-xmas" "gnus-art"))
 (put 'ispell 'custom-loads '("ispell"))
-(put 'mail 'custom-loads '("gnus" "message" "mh-e" "mail-abbrevs" "feedmail" "supercite" "highlight-headers" "smtpmail"))
+(put 'mail 'custom-loads '("gnus" "message" "mh-e" "mail-abbrevs" "feedmail" "metamail" "supercite" "highlight-headers" "smtpmail"))
 (put 'gnus-summary-exit 'custom-loads '("gnus-sum"))
 (put 'fortran-indent 'custom-loads '("fortran"))
 (put 'ps-print-face 'custom-loads '("ps-print"))
@@ -84,7 +84,7 @@
 (put 'dabbrev 'custom-loads '("dabbrev"))
 (put 'help-appearance 'custom-loads '("help"))
 (put 'display-time 'custom-loads '("time"))
-(put 'hypermedia 'custom-loads '("wid-edit" "gopher" "browse-url" "url-vars" "w3-cus"))
+(put 'hypermedia 'custom-loads '("wid-edit" "gopher" "metamail" "browse-url" "url-vars" "w3-cus"))
 (put 'save-place 'custom-loads '("saveplace"))
 (put 'w3-advanced 'custom-loads '("w3-cus"))
 (put 'lisp 'custom-loads '("edebug" "cl-indent" "elp"))
@@ -132,6 +132,7 @@
 (put 'ps-print 'custom-loads '("ps-print"))
 (put 'cc-indent 'custom-loads '("cc-mode"))
 (put 'comm 'custom-loads '("ssl"))
+(put 'ediff-window 'custom-loads '())
 (put 'gnus 'custom-loads '("gnus-art" "gnus-async" "gnus-cache" "gnus-demon" "gnus-dup" "gnus-eform" "gnus-uu" "gnus-win" "gnus-xmas" "gnus" "nnmail"))
 (put 'ps-print-font 'custom-loads '("ps-print"))
 (put 'id-select 'custom-loads '("id-select"))
@@ -144,7 +145,7 @@
 (put 'psgml-html 'custom-loads '("psgml-html"))
 (put 'nnmail 'custom-loads '("nnmail"))
 (put 'gnus-article-hiding 'custom-loads '("gnus-art" "gnus-sum"))
-(put 'customize 'custom-loads '("wid-edit" "cus-face" "cus-edit"))
+(put 'customize 'custom-loads '("cus-face" "wid-edit" "cus-edit"))
 (put 'w3-printing 'custom-loads '("w3-cus"))
 (put 'nnmail-duplicate 'custom-loads '("nnmail"))
 (put 'verilog 'custom-loads '("verilog-mode"))
@@ -157,12 +158,14 @@
 (put 'abbrev 'custom-loads '("cus-edit" "dabbrev"))
 (put 'f90-indent 'custom-loads '("f90"))
 (put 'nnmail-retrieve 'custom-loads '("nnmail"))
+(put 'ediff-ptch 'custom-loads '())
 (put 'url-history 'custom-loads '("url-vars"))
 (put 'message-interface 'custom-loads '("message"))
 (put 'gnus-group 'custom-loads '("gnus-topic" "gnus"))
 (put 'remote-compile 'custom-loads '("rcompile"))
 (put 'programming 'custom-loads '("cus-edit" "compile"))
 (put 'gnus-article-signature 'custom-loads '("gnus-art"))
+(put 'metamail 'custom-loads '("metamail"))
 (put 'toolbar 'custom-loads '("x-toolbar"))
 (put 'compilation 'custom-loads '("compile"))
 (put 'dired 'custom-loads '("dired-faces"))
@@ -227,6 +230,7 @@
 (put 'diary 'custom-loads '("calendar"))
 (put 'gnus-various 'custom-loads '("gnus-sum"))
 (put 'cc-syntax 'custom-loads '("cc-mode"))
+(put 'smiley 'custom-loads '())
 (put 'mh-compose 'custom-loads '("mh-comp"))
 (put 'xmine 'custom-loads '("xmine"))
 (put 'supercite-frames 'custom-loads '("supercite"))
@@ -235,12 +239,13 @@
 (put 'enriched 'custom-loads '("enriched"))
 (put 'gnus-article-highlight 'custom-loads '("gnus-art"))
 (put 'emacs 'custom-loads '("cus-edit"))
-(put 'processes 'custom-loads '("background" "comint" "rlogin" "shell" "cus-edit" "executable" "gnuserv" "ispell" "rcompile" "passwd"))
+(put 'processes 'custom-loads '("background" "comint" "rlogin" "shell" "cus-edit" "executable" "gnuserv" "ispell" "metamail" "rcompile" "passwd"))
 (put 'news 'custom-loads '("gnus" "message" "supercite" "highlight-headers"))
 (put 'rexx 'custom-loads '("rexx-mode"))
 (put 'w3-hooks 'custom-loads '("w3-cus"))
 (put 'executable 'custom-loads '("executable"))
 (put 'highlight-headers 'custom-loads '("highlight-headers"))
+(put 'gnus-cache 'custom-loads '())
 (put 'message-insertion 'custom-loads '("message"))
 (put 'hyper-apropos 'custom-loads '("hyper-apropos"))
 (put 'psgml-insert 'custom-loads '("psgml"))