[Emacs-diffs] Changes to emacs/lisp/cus-load.el

[Eli Zaretskii]

Index: emacs/lisp/cus-load.el
diff -c emacs/lisp/cus-load.el:1.39 emacs/lisp/cus-load.el:1.40
*** emacs/lisp/cus-load.el:1.39 Fri Oct 26 11:40:03 2001
--- emacs/lisp/cus-load.el      Sun Jan 20 11:02:31 2002
***************
*** 2,8 ****
  ;;
  ;;; Code:
  
! (put 'mime-display 'custom-loads '("mm-decode"))
  (put 'holidays 'custom-loads '("calendar"))
  (put 'SQL 'custom-loads '("sql"))
  (put 'refbib 'custom-loads '("refbib"))
--- 2,8 ----
  ;;
  ;;; Code:
  
! (put 'mime-display 'custom-loads '("mm-decode" "nnimap"))
  (put 'holidays 'custom-loads '("calendar"))
  (put 'SQL 'custom-loads '("sql"))
  (put 'refbib 'custom-loads '("refbib"))
***************
*** 112,118 ****
  (put 'mh-hook 'custom-loads '("mh-e"))
  (put 'yow 'custom-loads '("yow"))
  (put 'reftex-defining-label-environments 'custom-loads '("reftex-vars"))
! (put 'asm 'custom-loads '("asm-mode"))
  (put 'gnus-score-files 'custom-loads '("gnus-score" "gnus"))
  (put 'mail-abbrev 'custom-loads '("mailabbrev"))
  (put 'feedmail 'custom-loads '("feedmail"))
--- 112,118 ----
  (put 'mh-hook 'custom-loads '("mh-e"))
  (put 'yow 'custom-loads '("yow"))
  (put 'reftex-defining-label-environments 'custom-loads '("reftex-vars"))
! (put 'asm 'custom-loads '("asm-mode" "cc-vars"))
  (put 'gnus-score-files 'custom-loads '("gnus-score" "gnus"))
  (put 'mail-abbrev 'custom-loads '("mailabbrev"))
  (put 'feedmail 'custom-loads '("feedmail"))
***************
*** 140,147 ****
  (put 'feedmail-spray 'custom-loads '("feedmail"))
  (put 'idlwave-external-programs 'custom-loads '("idlwave"))
  (put 'strokes 'custom-loads '("strokes"))
! (put 'mouse 'custom-loads '("faces" "mouse" "menu-bar" "avoid" "mouse-sel" 
"msb" "mwheel" "strokes" "tooltip" "goto-addr" "artist"))
! (put 'nnmail-various 'custom-loads '("nnmail"))
  (put 'smiley 'custom-loads '("smiley-ems"))
  (put 'extensions 'custom-loads '("generic" "time-stamp" "wid-edit" 
"cust-print" "eldoc" "page-ext"))
  (put 'ebnf-displacement 'custom-loads '("ebnf2ps"))
--- 140,147 ----
  (put 'feedmail-spray 'custom-loads '("feedmail"))
  (put 'idlwave-external-programs 'custom-loads '("idlwave"))
  (put 'strokes 'custom-loads '("strokes"))
! (put 'mouse 'custom-loads '("faces" "mouse" "menu-bar" "avoid" "mouse-sel" 
"msb" "w32-vars" "mwheel" "strokes" "tooltip" "goto-addr" "artist"))
! (put 'nnmail-various 'custom-loads '("nnmail" "nntp"))
  (put 'smiley 'custom-loads '("smiley-ems"))
  (put 'extensions 'custom-loads '("generic" "time-stamp" "wid-edit" 
"cust-print" "eldoc" "page-ext"))
  (put 'ebnf-displacement 'custom-loads '("ebnf2ps"))
***************
*** 211,224 ****
  (put 'gnus-score-various 'custom-loads '("gnus-score" "gnus"))
  (put 'cperl-faces 'custom-loads '("cperl-mode"))
  (put 'goto-address 'custom-loads '("goto-addr"))
! (put 'gnus-nocem 'custom-loads '("gnus-nocem"))
  (put 'gnus-group-visual 'custom-loads '("gnus-group" "gnus"))
  (put 'paren-matching 'custom-loads '("simple" "paren"))
  (put 'font-lock 'custom-loads '("faces" "frame" "font-lock"))
  (put 'auto-save 'custom-loads '("files" "startup"))
  (put 'tpu 'custom-loads '("tpu-edt" "tpu-extras"))
! (put 'gnus-cite 'custom-loads '("gnus-cite"))
  (put 'viper-hooks 'custom-loads '("viper-init"))
  (put 'gnus-demon 'custom-loads '("gnus-demon"))
  (put 'reftex-optimizations-for-large-documents 'custom-loads '("reftex-vars"))
  (put 'viper-misc 'custom-loads '("viper-cmd" "viper-init" "viper"))
--- 211,225 ----
  (put 'gnus-score-various 'custom-loads '("gnus-score" "gnus"))
  (put 'cperl-faces 'custom-loads '("cperl-mode"))
  (put 'goto-address 'custom-loads '("goto-addr"))
! (put 'gnus-nocem 'custom-loads '("gnus-nocem" "gnus-sum"))
  (put 'gnus-group-visual 'custom-loads '("gnus-group" "gnus"))
  (put 'paren-matching 'custom-loads '("simple" "paren"))
  (put 'font-lock 'custom-loads '("faces" "frame" "font-lock"))
  (put 'auto-save 'custom-loads '("files" "startup"))
  (put 'tpu 'custom-loads '("tpu-edt" "tpu-extras"))
! (put 'w32 'custom-loads '("w32-vars"))
  (put 'viper-hooks 'custom-loads '("viper-init"))
+ (put 'gnus-cite 'custom-loads '("gnus-cite"))
  (put 'gnus-demon 'custom-loads '("gnus-demon"))
  (put 'reftex-optimizations-for-large-documents 'custom-loads '("reftex-vars"))
  (put 'viper-misc 'custom-loads '("viper-cmd" "viper-init" "viper"))
***************
*** 292,310 ****
  (put 'auto-insert 'custom-loads '("autoinsert"))
  (put 'abbrev 'custom-loads '("files" "cus-edit" "dabbrev" "expand" 
"hippie-exp" "quickurl"))
  (put 'ediff-merge 'custom-loads '("ediff-init" "ediff-merg"))
  (put 'vhdl 'custom-loads '("vhdl-mode"))
  (put 'gnus-summary-mail 'custom-loads '("gnus-sum"))
  (put 'ebnf-optimization 'custom-loads '("ebnf2ps"))
  (put 'apropos 'custom-loads '("apropos"))
  (put 'gomoku 'custom-loads '("gomoku"))
  (put 'eshell-pred 'custom-loads '("em-pred"))
! (put 'tools 'custom-loads '("add-log" "calculator" "compare-w" "diff-mode" 
"diff" "ediff" "elide-head" "emerge" "gud" "pcvs-defs" "smerge-mode" "speedbar" 
"tempo" "tooltip" "vc" "which-func" "rcompile" "copyright" "compile" "ebrowse" 
"etags" "glasses" "make-mode"))
  (put 'gnus-topic 'custom-loads '("gnus-topic"))
  (put 'sgml 'custom-loads '("sgml-mode"))
  (put 'keyboard 'custom-loads '("mule" "chistory" "type-break"))
  (put 'isearch-faces 'custom-loads '("isearch"))
- (put 'viper-mouse 'custom-loads '("viper-mous"))
  (put 'eshell-hist 'custom-loads '("em-hist"))
  (put 'ps-print-horizontal 'custom-loads '("ps-print"))
  (put 'woman 'custom-loads '("woman"))
  (put 'decipher 'custom-loads '("decipher"))
--- 293,312 ----
  (put 'auto-insert 'custom-loads '("autoinsert"))
  (put 'abbrev 'custom-loads '("files" "cus-edit" "dabbrev" "expand" 
"hippie-exp" "quickurl"))
  (put 'ediff-merge 'custom-loads '("ediff-init" "ediff-merg"))
+ (put 'reveal 'custom-loads '("reveal"))
  (put 'vhdl 'custom-loads '("vhdl-mode"))
  (put 'gnus-summary-mail 'custom-loads '("gnus-sum"))
  (put 'ebnf-optimization 'custom-loads '("ebnf2ps"))
  (put 'apropos 'custom-loads '("apropos"))
  (put 'gomoku 'custom-loads '("gomoku"))
  (put 'eshell-pred 'custom-loads '("em-pred"))
! (put 'tools 'custom-loads '("add-log" "calculator" "compare-w" "diff-mode" 
"diff" "ediff" "elide-head" "emerge" "gud" "pcvs-defs" "smerge-mode" "speedbar" 
"tempo" "tooltip" "vc" "which-func" "copyright" "rcompile" "compile" "ebrowse" 
"etags" "glasses" "make-mode"))
  (put 'gnus-topic 'custom-loads '("gnus-topic"))
  (put 'sgml 'custom-loads '("sgml-mode"))
  (put 'keyboard 'custom-loads '("mule" "chistory" "type-break"))
  (put 'isearch-faces 'custom-loads '("isearch"))
  (put 'eshell-hist 'custom-loads '("em-hist"))
+ (put 'viper-mouse 'custom-loads '("viper-mous"))
  (put 'ps-print-horizontal 'custom-loads '("ps-print"))
  (put 'woman 'custom-loads '("woman"))
  (put 'decipher 'custom-loads '("decipher"))
***************
*** 339,345 ****
  (put 'log-edit 'custom-loads '("log-edit"))
  (put 'message-forwarding 'custom-loads '("message"))
  (put 'message-faces 'custom-loads '("message"))
! (put 'environment 'custom-loads '("cus-edit" "dired" "faces" "dos-vars" 
"ruler-mode"))
  (put 'perl 'custom-loads '("perl-mode"))
  (put 'vhdl-port 'custom-loads '("vhdl-mode"))
  (put 'gnus-charset 'custom-loads '("gnus-group" "gnus-msg" "gnus-sum" "gnus"))
--- 341,348 ----
  (put 'log-edit 'custom-loads '("log-edit"))
  (put 'message-forwarding 'custom-loads '("message"))
  (put 'message-faces 'custom-loads '("message"))
! (put 'environment 'custom-loads '("cus-edit" "dired" "faces" "dos-vars" 
"ruler-mode" "w32-vars"))
! (put 'ibuffer 'custom-loads '("ibuf-ext" "ibuffer"))
  (put 'perl 'custom-loads '("perl-mode"))
  (put 'vhdl-port 'custom-loads '("vhdl-mode"))
  (put 'gnus-charset 'custom-loads '("gnus-group" "gnus-msg" "gnus-sum" "gnus"))
***************
*** 348,354 ****
  (put 'comm 'custom-loads '("eudc-vars" "ldap" "net-utils"))
  (put 'type-break 'custom-loads '("type-break"))
  (put 'mh 'custom-loads '("mh-comp" "mh-e" "mh-utils"))
! (put 'convenience 'custom-loads '("abbrev" "autoinsert" "autorevert" "bs" 
"calculator" "complete" "completion" "dabbrev" "ffap" "filecache" "follow" 
"hippie-exp" "imenu" "iswitchb" "repeat" "speedbar" "whitespace" "windmove" 
"pc-select"))
  (put 'lm 'custom-loads '("landmark"))
  (put 'ruler-mode 'custom-loads '("ruler-mode"))
  (put 'idlwave-routine-info 'custom-loads '("idlwave"))
--- 351,357 ----
  (put 'comm 'custom-loads '("eudc-vars" "ldap" "net-utils"))
  (put 'type-break 'custom-loads '("type-break"))
  (put 'mh 'custom-loads '("mh-comp" "mh-e" "mh-utils"))
! (put 'convenience 'custom-loads '("abbrev" "autoinsert" "autorevert" "bs" 
"calculator" "complete" "completion" "dabbrev" "ffap" "filecache" "follow" 
"hippie-exp" "ibuffer" "imenu" "iswitchb" "repeat" "speedbar" "whitespace" 
"windmove" "pc-select"))
  (put 'lm 'custom-loads '("landmark"))
  (put 'ruler-mode 'custom-loads '("ruler-mode"))
  (put 'idlwave-routine-info 'custom-loads '("idlwave"))
***************
*** 367,376 ****
  (put 'log-view 'custom-loads '("log-view"))
  (put 'PostScript 'custom-loads '("ps-mode"))
  (put 'abbrev-mode 'custom-loads '("abbrev" "cus-edit" "mailabbrev"))
- (put 'earcon 'custom-loads '("earcon"))
  (put 'eshell-term 'custom-loads '("em-term"))
  (put 'feedmail-headers 'custom-loads '("feedmail"))
! (put 'hypermedia 'custom-loads '("wid-edit" "browse-url" "goto-addr" 
"metamail"))
  (put 'image 'custom-loads '("image-file"))
  (put 'ff 'custom-loads '("find-file"))
  (put 'prolog 'custom-loads '("prolog"))
--- 370,379 ----
  (put 'log-view 'custom-loads '("log-view"))
  (put 'PostScript 'custom-loads '("ps-mode"))
  (put 'abbrev-mode 'custom-loads '("abbrev" "cus-edit" "mailabbrev"))
  (put 'eshell-term 'custom-loads '("em-term"))
+ (put 'earcon 'custom-loads '("earcon"))
  (put 'feedmail-headers 'custom-loads '("feedmail"))
! (put 'hypermedia 'custom-loads '("wid-edit" "metamail" "browse-url" 
"goto-addr"))
  (put 'image 'custom-loads '("image-file"))
  (put 'ff 'custom-loads '("find-file"))
  (put 'prolog 'custom-loads '("prolog"))
***************
*** 390,396 ****
  (put 'change-log 'custom-loads '("add-log"))
  (put 'gnus-group-levels 'custom-loads '("gnus-group" "gnus-start" "gnus"))
  (put 'cperl 'custom-loads '("cperl-mode"))
! (put 'bs-appearance 'custom-loads '("bs"))
  (put 'pcmpl-cvs 'custom-loads '("pcmpl-cvs"))
  (put 'eshell-mode 'custom-loads '("esh-mode"))
  (put 'files 'custom-loads '("mule" "files" "autoinsert" "autorevert" 
"cus-edit" "filecache" "recentf" "shadow" "ange-ftp"))
--- 393,399 ----
  (put 'change-log 'custom-loads '("add-log"))
  (put 'gnus-group-levels 'custom-loads '("gnus-group" "gnus-start" "gnus"))
  (put 'cperl 'custom-loads '("cperl-mode"))
! (put 'bs-appearance 'custom-loads '("bs" "button"))
  (put 'pcmpl-cvs 'custom-loads '("pcmpl-cvs"))
  (put 'eshell-mode 'custom-loads '("esh-mode"))
  (put 'files 'custom-loads '("mule" "files" "autoinsert" "autorevert" 
"cus-edit" "filecache" "recentf" "shadow" "ange-ftp"))
***************
*** 407,414 ****
  (put 'gnus-windows 'custom-loads '("gnus-win"))
  (put 'reftex-label-support 'custom-loads '("reftex-vars"))
  (put 'gnus-article-buttons 'custom-loads '("gnus-art"))
- (put 'gnus-summary 'custom-loads '("gnus-sum" "gnus"))
  (put 'old-c 'custom-loads '("c-mode" "cc-vars"))
  (put 'compilation 'custom-loads '("compile"))
  (put 'ediff-highlighting 'custom-loads '("ediff-init"))
  (put 'idlwave-shell-general-setup 'custom-loads '("idlw-shell" "idlwave"))
--- 410,417 ----
  (put 'gnus-windows 'custom-loads '("gnus-win"))
  (put 'reftex-label-support 'custom-loads '("reftex-vars"))
  (put 'gnus-article-buttons 'custom-loads '("gnus-art"))
  (put 'old-c 'custom-loads '("c-mode" "cc-vars"))
+ (put 'gnus-summary 'custom-loads '("gnus-sum" "gnus"))
  (put 'compilation 'custom-loads '("compile"))
  (put 'ediff-highlighting 'custom-loads '("ediff-init"))
  (put 'idlwave-shell-general-setup 'custom-loads '("idlw-shell" "idlwave"))
***************
*** 454,460 ****
  (put 'idlwave-completion 'custom-loads '("idlwave"))
  (put 'eshell-rebind 'custom-loads '("em-rebind"))
  (put 'bibtex 'custom-loads '("bibtex"))
! (put 'faces 'custom-loads '("faces" "loaddefs" "facemenu" "cus-edit" 
"font-lock" "hilit-chg" "paren" "ps-print" "speedbar" "time" "wid-edit" "woman" 
"gnus" "message" "cwarn" "make-mode"))
  (put 'gnus-summary-various 'custom-loads '("gnus-sum"))
  (put 'applications 'custom-loads '("calendar" "cus-edit" "uniquify" "eshell" 
"spell"))
  (put 'ebrowse-member 'custom-loads '("ebrowse"))
--- 457,463 ----
  (put 'idlwave-completion 'custom-loads '("idlwave"))
  (put 'eshell-rebind 'custom-loads '("em-rebind"))
  (put 'bibtex 'custom-loads '("bibtex"))
! (put 'faces 'custom-loads '("faces" "loaddefs" "facemenu" "cus-edit" 
"font-lock" "hilit-chg" "paren" "ps-print" "speedbar" "time" "whitespace" 
"wid-edit" "woman" "gnus" "message" "cwarn" "make-mode"))
  (put 'gnus-summary-various 'custom-loads '("gnus-sum"))
  (put 'applications 'custom-loads '("calendar" "cus-edit" "uniquify" "eshell" 
"spell"))
  (put 'ebrowse-member 'custom-loads '("ebrowse"))
***************
*** 476,482 ****
  (put 'message-sending 'custom-loads '("message"))
  (put 'archive-arc 'custom-loads '("arc-mode"))
  (put 'rmail-output 'custom-loads '("rmailout"))
! (put 'editing 'custom-loads '("simple" "indent" "paragraphs" "cus-edit" 
"faces" "outline" "hl-line" "vcursor" "view" "whitespace" "auto-show" "hscroll" 
"picture"))
  (put 'crisp 'custom-loads '("crisp"))
  (put 'nroff 'custom-loads '("nroff-mode"))
  (put 'gnus-group-icons 'custom-loads '("gnus-group"))
--- 479,485 ----
  (put 'message-sending 'custom-loads '("message"))
  (put 'archive-arc 'custom-loads '("arc-mode"))
  (put 'rmail-output 'custom-loads '("rmailout"))
! (put 'editing 'custom-loads '("simple" "indent" "paragraphs" "cus-edit" 
"faces" "outline" "hl-line" "reveal" "vcursor" "view" "whitespace" "auto-show" 
"hscroll" "picture"))
  (put 'crisp 'custom-loads '("crisp"))
  (put 'nroff 'custom-loads '("nroff-mode"))
  (put 'gnus-group-icons 'custom-loads '("gnus-group"))
***************
*** 492,499 ****
  (put 'reftex-index-support 'custom-loads '("reftex-vars"))
  (put 'pascal 'custom-loads '("pascal"))
  (put 'rmail-retrieve 'custom-loads '("rmail" "rmailsum"))
! (put 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" 
"saveplace" "sort" "tar-mode" "time-stamp" "snmp-mode" "timeclock"))
! (put 'mail 'custom-loads '("simple" "startup" "time" "eudc-vars" "gnus" 
"mail-utils" "mm-decode" "message" "imap" "starttls" "emacsbug" "feedmail" 
"mail-extr" "mail-hist" "mailalias" "metamail" "mh-e" "mspools" "rmail" 
"sendmail" "smtpmail" "supercite" "uce" "fortune"))
  (put 'paren-blinking 'custom-loads '("simple"))
  (put 'gnus-summary-sort 'custom-loads '("gnus-sum"))
  (put 'fast-lock 'custom-loads '("fast-lock"))
--- 495,502 ----
  (put 'reftex-index-support 'custom-loads '("reftex-vars"))
  (put 'pascal 'custom-loads '("pascal"))
  (put 'rmail-retrieve 'custom-loads '("rmail" "rmailsum"))
! (put 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" 
"saveplace" "sort" "tar-mode" "time-stamp" "timeclock" "snmp-mode"))
! (put 'mail 'custom-loads '("simple" "startup" "time" "gnus" "mail-utils" 
"mm-decode" "message" "imap" "starttls" "emacsbug" "feedmail" "mail-extr" 
"mail-hist" "mailalias" "metamail" "mh-e" "mspools" "rmail" "sendmail" 
"smtpmail" "supercite" "uce" "eudc-vars" "fortune"))
  (put 'paren-blinking 'custom-loads '("simple"))
  (put 'gnus-summary-sort 'custom-loads '("gnus-sum"))
  (put 'fast-lock 'custom-loads '("fast-lock"))
***************
*** 502,508 ****
  (put 'customize 'custom-loads '("wid-edit" "cus-edit"))
  (put 'dired 'custom-loads '("files" "ls-lisp" "dired-aux" "dired-x" "dired" 
"find-dired"))
  (put 'recentf 'custom-loads '("recentf"))
! (put 'fill 'custom-loads '("simple" "newcomment" "fill" "align"))
  (put 'outlines 'custom-loads '("allout" "outline" "ooutline"))
  (put 'latin1-display 'custom-loads '("latin1-disp"))
  (put 'paragraphs 'custom-loads '("paragraphs"))
--- 505,511 ----
  (put 'customize 'custom-loads '("wid-edit" "cus-edit"))
  (put 'dired 'custom-loads '("files" "ls-lisp" "dired-aux" "dired-x" "dired" 
"find-dired"))
  (put 'recentf 'custom-loads '("recentf"))
! (put 'fill 'custom-loads '("simple" "newcomment" "paragraphs" "fill" "align"))
  (put 'outlines 'custom-loads '("allout" "outline" "ooutline"))
  (put 'latin1-display 'custom-loads '("latin1-disp"))
  (put 'paragraphs 'custom-loads '("paragraphs"))
***************
*** 511,516 ****
--- 514,520 ----
  (put 'makefile 'custom-loads '("make-mode"))
  (put 'supercite-attr 'custom-loads '("supercite"))
  (put 'fortune 'custom-loads '("fortune"))
+ (put 'whitespace-faces 'custom-loads '("whitespace"))
  (put 'diff-mode 'custom-loads '("diff-mode"))
  (put 'isearch-lazy-highlight 'custom-loads '("isearch"))
  (put 'gnus-asynchronous 'custom-loads '("gnus-async"))
***************
*** 564,576 ****
  (put 'mailcap 'custom-loads '("mailcap"))
  (put 'viper-search 'custom-loads '("viper-init"))
  (put 'ls-lisp 'custom-loads '("ls-lisp"))
! (put 'mule 'custom-loads '("mule" "mule-cmds" "kkc"))
  (put 'glasses 'custom-loads '("glasses"))
  (put 'vhdl-style 'custom-loads '("vhdl-mode"))
  (put 'tempo 'custom-loads '("tempo"))
  (put 'c 'custom-loads '("cc-vars" "cmacexp" "cpp" "hideif"))
  (put 'nnmail-prepare 'custom-loads '("nnmail"))
! (put 'processes 'custom-loads '("ansi-color" "comint" "cus-edit" "executable" 
"pcomplete" "shell" "term" "rcompile" "rlogin" "metamail" "compile" "sql" 
"flyspell"))
  (put 'ebnf2ps 'custom-loads '("ebnf2ps"))
  (put 'sendmail 'custom-loads '("sendmail"))
  (put 'gnus-article-signature 'custom-loads '("gnus-art"))
--- 568,580 ----
  (put 'mailcap 'custom-loads '("mailcap"))
  (put 'viper-search 'custom-loads '("viper-init"))
  (put 'ls-lisp 'custom-loads '("ls-lisp"))
! (put 'mule 'custom-loads '("mule" "mule-cmds" "utf-8" "kkc"))
  (put 'glasses 'custom-loads '("glasses"))
  (put 'vhdl-style 'custom-loads '("vhdl-mode"))
  (put 'tempo 'custom-loads '("tempo"))
  (put 'c 'custom-loads '("cc-vars" "cmacexp" "cpp" "hideif"))
  (put 'nnmail-prepare 'custom-loads '("nnmail"))
! (put 'processes 'custom-loads '("ansi-color" "comint" "cus-edit" "executable" 
"pcomplete" "shell" "term" "metamail" "rcompile" "rlogin" "compile" "sql" 
"flyspell"))
  (put 'ebnf2ps 'custom-loads '("ebnf2ps"))
  (put 'sendmail 'custom-loads '("sendmail"))
  (put 'gnus-article-signature 'custom-loads '("gnus-art"))
***************
*** 678,683 ****
--- 682,689 ----
  (custom-put-if-not 'elide-head 'group-documentation "Eliding copyright 
headers and the like in source files.")
  (custom-put-if-not 'ps-line-number-color 'custom-version "21.1")
  (custom-put-if-not 'ps-line-number-color 'standard-value t)
+ (custom-put-if-not 'sgml-xml 'custom-version "21.2")
+ (custom-put-if-not 'sgml-xml 'standard-value t)
  (custom-put-if-not 'confirm-kill-emacs 'custom-version "21.1")
  (custom-put-if-not 'confirm-kill-emacs 'standard-value t)
  (custom-put-if-not 'vc-rcs-checkout-switches 'custom-version "21.1")
***************
*** 686,691 ****
--- 692,701 ----
  (custom-put-if-not 'change-log-conditionals-face 'group-documentation nil)
  (custom-put-if-not 'mail-source 'custom-version "21.1")
  (custom-put-if-not 'mail-source 'group-documentation "The mail-fetching 
library.")
+ (custom-put-if-not 'smtpmail-auth-credentials 'custom-version "21.1")
+ (custom-put-if-not 'smtpmail-auth-credentials 'standard-value t)
+ (custom-put-if-not 'minibuffer-prompt 'custom-version "21.3")
+ (custom-put-if-not 'minibuffer-prompt 'group-documentation nil)
  (custom-put-if-not 'speedbar-visiting-tag-hook 'custom-version "21.1")
  (custom-put-if-not 'speedbar-visiting-tag-hook 'standard-value t)
  (custom-put-if-not 'eshell 'custom-version "21.1")
***************
*** 706,711 ****
--- 716,723 ----
  (custom-put-if-not 'vc-dired-recurse 'standard-value t)
  (custom-put-if-not 'ps-begin-cut-regexp 'custom-version "21.1")
  (custom-put-if-not 'ps-begin-cut-regexp 'standard-value t)
+ (custom-put-if-not 'ange-ftp-passive-host-alist 'custom-version 21.3)
+ (custom-put-if-not 'ange-ftp-passive-host-alist 'standard-value t)
  (custom-put-if-not 'flyspell-deplacement-commands 'custom-version "21.1")
  (custom-put-if-not 'flyspell-deplacement-commands 'standard-value t)
  (custom-put-if-not 'change-log-email-face 'custom-version "21.1")
***************
*** 734,741 ****
  (custom-put-if-not 'flyspell-tex-command-regexp 'standard-value t)
  (custom-put-if-not 
'flyspell-dictionaries-that-consider-dash-as-word-delimiter 'custom-version 
"21.1")
  (custom-put-if-not 
'flyspell-dictionaries-that-consider-dash-as-word-delimiter 'standard-value t)
- (custom-put-if-not 'html-xhtml 'custom-version "21.2")
- (custom-put-if-not 'html-xhtml 'standard-value t)
  (custom-put-if-not 'sql-oracle-options 'custom-version "20.8")
  (custom-put-if-not 'sql-oracle-options 'standard-value t)
  (custom-put-if-not 'find-function-regexp 'custom-version "21.1")
--- 746,751 ----
***************
*** 770,775 ****
--- 780,787 ----
  (custom-put-if-not 'region 'group-documentation nil)
  (custom-put-if-not 'change-log-version-info-enabled 'custom-version "21.1")
  (custom-put-if-not 'change-log-version-info-enabled 'standard-value t)
+ (custom-put-if-not 'w32 'custom-version "21.3")
+ (custom-put-if-not 'w32 'group-documentation "MS-Windows specific features")
  (custom-put-if-not 'find-file-suppress-same-file-warnings 'custom-version 
"21.1")
  (custom-put-if-not 'find-file-suppress-same-file-warnings 'standard-value t)
  (custom-put-if-not 'change-log-name-face 'custom-version "21.1")
***************
*** 891,896 ****
--- 903,910 ----
  (custom-put-if-not 'query-replace-to-history-variable 'standard-value t)
  (custom-put-if-not 'gnus-mime-multipart-functions 'custom-version "21.1")
  (custom-put-if-not 'gnus-mime-multipart-functions 'standard-value t)
+ (custom-put-if-not 'query-replace-skip-read-only 'custom-version "21.3")
+ (custom-put-if-not 'query-replace-skip-read-only 'standard-value t)
  (custom-put-if-not 'which-func 'custom-version "20.3")
  (custom-put-if-not 'which-func 'group-documentation "Mode to display the 
current function name in the modeline.")
  (custom-put-if-not 'read-mail-command 'custom-version "21.1")
***************
*** 921,927 ****
  (custom-put-if-not 'calculator 'group-documentation "Simple Emacs 
calculator.")
  (custom-put-if-not 'custom-button-pressed-face 'custom-version "21.1")
  (custom-put-if-not 'custom-button-pressed-face 'group-documentation nil)
! (custom-put-if-not 'ruler-mode 'custom-version "21.2")
  (custom-put-if-not 'ruler-mode 'group-documentation "Display a ruler in the 
header line.")
  (custom-put-if-not 'dos-codepage-setup-hook 'custom-version "20.3.3")
  (custom-put-if-not 'dos-codepage-setup-hook 'standard-value t)
--- 935,941 ----
  (custom-put-if-not 'calculator 'group-documentation "Simple Emacs 
calculator.")
  (custom-put-if-not 'custom-button-pressed-face 'custom-version "21.1")
  (custom-put-if-not 'custom-button-pressed-face 'group-documentation nil)
! (custom-put-if-not 'ruler-mode 'custom-version "21.3")
  (custom-put-if-not 'ruler-mode 'group-documentation "Display a ruler in the 
header line.")
  (custom-put-if-not 'dos-codepage-setup-hook 'custom-version "20.3.3")
  (custom-put-if-not 'dos-codepage-setup-hook 'standard-value t)
***************
*** 1017,1022 ****
--- 1031,1038 ----
  (custom-put-if-not 'gnus-emphasize-whitespace-regexp 'standard-value t)
  (custom-put-if-not 'gnus-summary-show-article-charset-alist 'custom-version 
"21.1")
  (custom-put-if-not 'gnus-summary-show-article-charset-alist 'standard-value t)
+ (custom-put-if-not 'xscheme-start-hook 'custom-version 20.3)
+ (custom-put-if-not 'xscheme-start-hook 'standard-value t)
  (custom-put-if-not 'vc-dired-listing-switches 'custom-version "21.1")
  (custom-put-if-not 'vc-dired-listing-switches 'standard-value t)
  (custom-put-if-not 'rmail-movemail-flags 'custom-version "20.3")
***************
*** 1089,1094 ****
--- 1105,1112 ----
  (custom-put-if-not 'vc-rcs-diff-switches 'standard-value t)
  (custom-put-if-not 'change-log-function-face 'custom-version "21.1")
  (custom-put-if-not 'change-log-function-face 'group-documentation nil)
+ (custom-put-if-not 'smtpmail-starttls-credentials 'custom-version "21.1")
+ (custom-put-if-not 'smtpmail-starttls-credentials 'standard-value t)
  (custom-put-if-not 'hscroll-global-mode 'custom-version "20.3")
  (custom-put-if-not 'hscroll-global-mode 'standard-value t)
  (custom-put-if-not 'message-default-charset 'custom-version "21.1")
***************
*** 1126,1132 ****
  (custom-put-if-not 'eval-expression-print-level 'custom-version "21.1")
  (custom-put-if-not 'eval-expression-print-level 'standard-value t)
  
! (defvar custom-versions-load-alist '(("20.3.3" "dos-vars") (21.1 "ange-ftp") 
("20.4" "files" "help" "sh-script" "compile") ("21.2" "add-log" "sgml-mode") 
("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" 
"mailabbrev" "frame" "uce" "mouse" "diary-lib" "sendmail" "simple" "debug" 
"hexl" "vcursor" "vc" "compile" "etags" "help-mode" "browse-url" "add-log" 
"find-func" "cus-edit" "replace") ("21.1" "server" "debug" "rmailedit" 
"dabbrev" "isearch" "gnus-start" "mule" "hideshow" "sendmail" "paths" 
"sgml-mode" "net-utils" "cperl-mode" "rmail" "font-lock" "gnus-nocem" 
"vc-hooks" "paren" "faces" "fortran" "vc" "etags" "cus-edit" "frame" "vc-sccs" 
"gnus-group" "gnus-sum" "smtpmail" "add-log" "find-func" "wid-edit" "vc-rcs" 
"files" "nnmail" "message" "ps-print" "vc-cvs" "simple" "gnus-agent" "flyspell" 
"gnus-art" "browse-url" "speedbar") ("20.8" "sql"))
   "For internal use by custom.")
  
  (provide 'cus-load)
--- 1144,1150 ----
  (custom-put-if-not 'eval-expression-print-level 'custom-version "21.1")
  (custom-put-if-not 'eval-expression-print-level 'standard-value t)
  
! (defvar custom-versions-load-alist '((20.3 "xscheme") ("20.3.3" "dos-vars") 
(21.1 "ange-ftp") ("21.3" "replace") ("20.4" "files" "help" "sh-script" 
"compile") (21.3 "ange-ftp") ("21.2" "add-log" "sgml-mode") ("20.3" "desktop" 
"easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "frame" 
"uce" "mouse" "diary-lib" "sendmail" "simple" "debug" "hexl" "vcursor" "vc" 
"compile" "etags" "help-mode" "browse-url" "add-log" "find-func" "cus-edit" 
"replace") ("21.1" "server" "debug" "rmailedit" "dabbrev" "isearch" 
"gnus-start" "mule" "hideshow" "sendmail" "paths" "sgml-mode" "net-utils" 
"cperl-mode" "rmail" "font-lock" "gnus-nocem" "vc-hooks" "paren" "faces" 
"fortran" "vc" "etags" "cus-edit" "frame" "vc-sccs" "gnus-group" "gnus-sum" 
"add-log" "find-func" "wid-edit" "smtpmail" "vc-rcs" "files" "nnmail" "message" 
"ps-print" "vc-cvs" "simple" "gnus-agent" "flyspell" "gnus-art" "browse-url" 
"speedbar") ("20.8" "sql"))
   "For internal use by custom.")
  
  (provide 'cus-load)