--- a/lisp/custom-load.el	Mon Aug 13 11:19:22 2007 +0200
+++ b/lisp/custom-load.el	Mon Aug 13 11:20:41 2007 +0200
@@ -2,8 +2,6 @@
 
 ;;; Code:
 
-(autoload 'custom-add-loads "cus-load")
-
 (custom-add-loads 'extensions '("auto-show" "wid-edit"))
 (custom-add-loads 'info-faces '("info"))
 (custom-add-loads 'custom-buffer '("cus-edit"))
@@ -17,7 +15,7 @@
 (custom-add-loads 'menu '("menubar-items"))
 (custom-add-loads 'minibuffer '("simple" "minibuf"))
 (custom-add-loads 'log-message '("simple"))
-(custom-add-loads 'environment '("frame" "keydefs" "minibuf" "modeline" "window-xemacs" "menubar" "gutter" "x-init" "toolbar-items" "cus-edit" "gnuserv" "sound"))
+(custom-add-loads 'environment '("frame" "keydefs" "minibuf" "modeline" "window-xemacs" "menubar" "x-init" "toolbar-items" "cus-edit" "gnuserv" "sound"))
 (custom-add-loads 'sound '("sound"))
 (custom-add-loads 'pui '("package-ui"))
 (custom-add-loads 'terminals '("gnuserv"))
@@ -45,11 +43,10 @@
 (custom-add-loads 'comm '("ldap"))
 (custom-add-loads 'backup '("files"))
 (custom-add-loads 'frames '("frame" "window-xemacs" "gui" "gnuserv"))
-(custom-add-loads 'customize '("wid-edit" "cus-edit"))
+(custom-add-loads 'customize '("cus-edit" "wid-edit"))
 (custom-add-loads 'custom-browse '("cus-edit"))
 (custom-add-loads 'abbrev '("abbrev" "files"))
 (custom-add-loads 'programming '("cus-edit"))
-(custom-add-loads 'printing '("printer"))
 (custom-add-loads 'toolbar '("toolbar-items"))
 (custom-add-loads 'dired '("files"))
 (custom-add-loads 'dnd-debug '("dragdrop"))
@@ -58,14 +55,13 @@
 (custom-add-loads 'widget-button '("wid-edit"))
 (custom-add-loads 'paren-blinking '("simple"))
 (custom-add-loads 'find-file '("files"))
-(custom-add-loads 'font-menu '("font-menu"))
+(custom-add-loads 'font-menu '("x-font-menu"))
 (custom-add-loads 'files '("files"))
 (custom-add-loads 'build '("build-report"))
 (custom-add-loads 'font-lock '("font-lock"))
 (custom-add-loads 'external '("process" "cus-edit"))
 (custom-add-loads 'development '("process" "lisp-mode" "cus-edit"))
 (custom-add-loads 'gnuserv '("gnuserv"))
-(custom-add-loads 'gutter '("gutter" "gutter-items"))
 (custom-add-loads 'fill-comments '("simple"))
 (custom-add-loads 'windows '("window" "window-xemacs"))
 (custom-add-loads 'widget-faces '("wid-edit"))
@@ -77,16 +73,15 @@
 (custom-add-loads 'emacs '("faces" "help" "files" "cus-edit" "package-get"))
 (custom-add-loads 'processes '("process" "gnuserv"))
 (custom-add-loads 'hyper-apropos '("hyper-apropos"))
-(custom-add-loads 'wp '("printer" "cus-edit"))
+(custom-add-loads 'wp '("cus-edit"))
 (custom-add-loads 'vc '("files"))
 (custom-add-loads 'isearch '("isearch-mode"))
 (custom-add-loads 'font-lock-faces '("font-lock"))
 (custom-add-loads 'modeline '("modeline"))
-(custom-add-loads 'editing '("simple" "abbrev" "fill" "mouse" "cus-edit" "dragdrop"))
+(custom-add-loads 'editing '("simple" "abbrev" "fill" "mouse" "dragdrop" "cus-edit"))
 (custom-add-loads 'matching '("simple" "isearch-mode" "hyper-apropos"))
 (custom-add-loads 'i18n '("cus-edit"))
 (custom-add-loads 'info '("toolbar-items" "info"))
-(custom-add-loads 'x '("x-faces"))
-(custom-add-loads 'buffers-tab '("gutter-items"))
+(custom-add-loads 'x '("x-faces" "x-font-menu"))
 
 ;;; custom-load.el ends here