1 files changed, 31 insertions, 17 deletions
diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index 27605eb750a..ca16b06959a 100644
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -230,6 +230,7 @@
 (put 'ansi-colors 'custom-loads '("ansi-color"))
 (put 'file-cache 'custom-loads '("filecache"))
 (put 'uce 'custom-loads '("uce"))
+(put 'starttls 'custom-loads '("starttls"))
 (put 'boolean 'custom-loads '("bookmark"))
 (put 'backup 'custom-loads '("files"))
 (put 'matching 'custom-loads '("simple" "isearch" "replace" "bookmark" "completion" "ffap" "imenu"))
@@ -299,7 +300,7 @@
 (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" "compile" "ebrowse" "etags" "glasses" "make-mode" "rcompile"))
 (put 'gnus-topic 'custom-loads '("gnus-topic"))
 (put 'sgml 'custom-loads '("sgml-mode"))
-(put 'keyboard 'custom-loads '("simple" "chistory" "type-break"))
+(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"))
@@ -390,7 +391,7 @@
 (put 'bs-appearance 'custom-loads '("bs"))
 (put 'pcmpl-cvs 'custom-loads '("pcmpl-cvs"))
 (put 'eshell-mode 'custom-loads '("esh-mode"))
-(put 'files 'custom-loads '("files" "autoinsert" "autorevert" "cus-edit" "filecache" "recentf" "shadow" "ange-ftp"))
+(put 'files 'custom-loads '("mule" "files" "autoinsert" "autorevert" "cus-edit" "filecache" "recentf" "shadow" "ange-ftp"))
 (put 'pcl-cvs 'custom-loads '("cvs-status" "log-edit" "log-view" "pcvs-defs" "pcvs-info" "pcvs-parse" "pcvs"))
 (put 'rmail-files 'custom-loads '("rmail"))
 (put 'gnus-summary-format 'custom-loads '("gnus-sum" "gnus"))
@@ -404,11 +405,11 @@
 (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 'old-c 'custom-loads '("c-mode"))
 (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"))
+(put 'idlwave-shell-general-setup 'custom-loads '("idlw-shell" "idlwave"))
 (put 'xscheme 'custom-loads '("xscheme"))
 (put 'checkdoc 'custom-loads '("checkdoc"))
 (put 'gnus-article-hiding 'custom-loads '("gnus-art" "gnus-sum"))
@@ -473,7 +474,7 @@
 (put 'message-sending 'custom-loads '("message"))
 (put 'archive-arc 'custom-loads '("arc-mode"))
 (put 'rmail-output 'custom-loads '("rmailout"))
-(put 'editing 'custom-loads '("simple" "view" "indent" "paragraphs" "auto-show" "cus-edit" "faces" "outline" "hl-line" "hscroll" "vcursor" "whitespace" "picture"))
+(put 'editing 'custom-loads '("simple" "view" "indent" "paragraphs" "cus-edit" "faces" "ooutline" "hl-line" "vcursor" "whitespace" "picture" "auto-show" "hscroll"))
 (put 'crisp 'custom-loads '("crisp"))
 (put 'nroff 'custom-loads '("nroff-mode"))
 (put 'gnus-group-icons 'custom-loads '("gnus-group"))
@@ -490,17 +491,17 @@
 (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" "emacsbug" "feedmail" "mail-extr" "mail-hist" "mailalias" "metamail" "mh-e" "mspools" "rmail" "sendmail" "smtpmail" "supercite" "uce" "fortune" "eudc-vars"))
+(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" "fortune" "eudc-vars"))
 (put 'paren-blinking 'custom-loads '("simple"))
 (put 'gnus-summary-sort 'custom-loads '("gnus-sum"))
 (put 'fast-lock 'custom-loads '("fast-lock"))
 (put 'gnus-group-new 'custom-loads '("gnus-start"))
 (put 'viper-highlighting 'custom-loads '("viper-init"))
 (put 'customize 'custom-loads '("wid-edit" "cus-edit"))
-(put 'dired 'custom-loads '("files" "dired-aux" "dired-x" "dired" "find-dired"))
+(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 'outlines 'custom-loads '("allout" "ooutline" "outline"))
 (put 'latin1-display 'custom-loads '("latin1-disp"))
 (put 'paragraphs 'custom-loads '("paragraphs"))
 (put 'ebrowse 'custom-loads '("ebrowse"))
@@ -560,11 +561,12 @@
 (put 'hideshow 'custom-loads '("hideshow"))
 (put 'mailcap 'custom-loads '("mailcap"))
 (put 'viper-search 'custom-loads '("viper-init"))
-(put 'mule 'custom-loads '("mule-cmds" "kkc"))
+(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 '("tooltip" "cc-vars" "cmacexp" "cpp" "hideif"))
+(put 'c 'custom-loads '("tooltip" "cc-vars" "c-mode" "cmacexp" "cpp" "hideif"))
 (put 'nnmail-prepare 'custom-loads '("nnmail"))
 (put 'processes 'custom-loads '("ansi-color" "comint" "cus-edit" "executable" "pcomplete" "shell" "term" "metamail" "compile" "sql" "flyspell" "rcompile" "rlogin"))
 (put 'ebnf2ps 'custom-loads '("ebnf2ps"))
@@ -660,8 +662,6 @@
 (custom-put-if-not 'change-log-date-face 'group-documentation nil)
 (custom-put-if-not 'find-tag-marker-ring-length 'custom-version "20.3")
 (custom-put-if-not 'find-tag-marker-ring-length 'standard-value t)
-(custom-put-if-not 'input-mode-8-bit 'custom-version "21.1")
-(custom-put-if-not 'input-mode-8-bit 'standard-value t)
 (custom-put-if-not 'elide-head 'custom-version "21.1")
 (custom-put-if-not 'elide-head 'group-documentation "Eliding copyright headers and the like in source files.")
 (custom-put-if-not 'vc-rcs-checkout-switches 'custom-version "21.1")
@@ -688,8 +688,6 @@ the tasks accomplished by such tools.")
 (custom-put-if-not 'change-log-email-face 'group-documentation nil)
 (custom-put-if-not 'mouse 'custom-version "21.1")
 (custom-put-if-not 'mouse 'group-documentation "Input from the mouse.")
-(custom-put-if-not 'ansi-color-for-shell-mode 'custom-version "20.8")
-(custom-put-if-not 'ansi-color-for-shell-mode 'standard-value t)
 (custom-put-if-not 'snmp 'custom-version "20.4")
 (custom-put-if-not 'snmp 'group-documentation "Mode for editing SNMP MIB files.")
 (custom-put-if-not 'widget-image-enable 'custom-version "21.1")
@@ -737,7 +735,7 @@ the tasks accomplished by such tools.")
 (custom-put-if-not 'gnus-ignored-from-addresses 'custom-version "21.1")
 (custom-put-if-not 'gnus-ignored-from-addresses 'standard-value t)
 (custom-put-if-not 'ansi-colors 'custom-version "20.7")
-(custom-put-if-not 'ansi-colors 'group-documentation "Translating SGR control sequences to text-properties.
+(custom-put-if-not 'ansi-colors 'group-documentation "Translating SGR control sequences to faces.
 This translation effectively colorizes strings and regions based upon
 SGR control sequences embedded in the text.  SGR (Select Graphic
 Rendition) control sequences are defined in section 3.8.117 of the
@@ -745,6 +743,8 @@ ECMA-48 standard (identical to ISO/IEC 6429), which is freely available
 as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'gnus-group-name-charset-method-alist 'custom-version "21.1")
 (custom-put-if-not 'gnus-group-name-charset-method-alist 'standard-value t)
+(custom-put-if-not 'starttls 'custom-version "21.1")
+(custom-put-if-not 'starttls 'group-documentation "Support for `Transport Layer Security' protocol.")
 (custom-put-if-not 'vc-sccs-register-switches 'custom-version "21.1")
 (custom-put-if-not 'vc-sccs-register-switches 'standard-value t)
 (custom-put-if-not 'gnus-article-date-lapsed-new-header 'custom-version "21.1")
@@ -791,6 +791,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'vc-rcs-header 'standard-value t)
 (custom-put-if-not 'vhdl 'custom-version "20.4")
 (custom-put-if-not 'vhdl 'group-documentation "Customizations for VHDL Mode.")
+(custom-put-if-not 'message-mail-user-agent 'custom-version "21.1")
+(custom-put-if-not 'message-mail-user-agent 'standard-value t)
 (custom-put-if-not 'face-font-registry-alternatives 'custom-version "21.1")
 (custom-put-if-not 'face-font-registry-alternatives 'standard-value t)
 (custom-put-if-not 'show-paren-priority 'custom-version "21.1")
@@ -843,6 +845,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'net-utils 'group-documentation "Network utility functions.")
 (custom-put-if-not 'log-edit 'custom-version "21.1")
 (custom-put-if-not 'log-edit 'group-documentation "Major mode for editing RCS and CVS commit messages.")
+(custom-put-if-not 'cperl-invalid-face 'custom-version "21.1")
+(custom-put-if-not 'cperl-invalid-face 'standard-value t)
 (custom-put-if-not 'finger-X.500-host-regexps 'custom-version "21.1")
 (custom-put-if-not 'finger-X.500-host-regexps 'standard-value t)
 (custom-put-if-not 'uce-mail-reader 'custom-version "20.3")
@@ -914,7 +918,7 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'speedbar-indentation-width 'custom-version "21.1")
 (custom-put-if-not 'speedbar-indentation-width 'standard-value t)
 (custom-put-if-not 'hl-line 'custom-version "21.1")
-(custom-put-if-not 'hl-line 'group-documentation "Highliight the current line.")
+(custom-put-if-not 'hl-line 'group-documentation "Highlight the current line.")
 (custom-put-if-not 'find-file-wildcards 'custom-version "20.4")
 (custom-put-if-not 'find-file-wildcards 'standard-value t)
 (custom-put-if-not 'custom-comment-face 'custom-version "21.1")
@@ -927,6 +931,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'show-paren-ring-bell-on-mismatch 'standard-value t)
 (custom-put-if-not 'rmail-default-body-file 'custom-version "20.3")
 (custom-put-if-not 'rmail-default-body-file 'standard-value t)
+(custom-put-if-not 'ansi-color-for-comint-mode 'custom-version "20.8")
+(custom-put-if-not 'ansi-color-for-comint-mode 'standard-value t)
 (custom-put-if-not 'gnus-emphasize-whitespace-regexp 'custom-version "21.1")
 (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")
@@ -935,6 +941,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'vc-dired-listing-switches 'standard-value t)
 (custom-put-if-not 'rmail-movemail-flags 'custom-version "20.3")
 (custom-put-if-not 'rmail-movemail-flags 'standard-value t)
+(custom-put-if-not 'keyboard-coding-system 'custom-version "21.1")
+(custom-put-if-not 'keyboard-coding-system 'standard-value t)
 (custom-put-if-not 'sql-sybase-options 'custom-version "20.8")
 (custom-put-if-not 'sql-sybase-options 'standard-value t)
 (custom-put-if-not 'gnus-read-newsrc-file 'custom-version "21.1")
@@ -965,6 +973,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'diary-unknown-time 'standard-value t)
 (custom-put-if-not 'browse-url-lynx-emacs-args 'custom-version "20.3")
 (custom-put-if-not 'browse-url-lynx-emacs-args 'standard-value t)
+(custom-put-if-not 'todo 'custom-version "21.1")
+(custom-put-if-not 'todo 'group-documentation "Maintain a list of todo items.")
 (custom-put-if-not 'tooltip 'custom-version "21.1")
 (custom-put-if-not 'tooltip 'group-documentation "Customization group for the `tooltip' package.")
 (custom-put-if-not 'gnus-newsgroup-ignored-charsets 'custom-version "21.1")
@@ -977,6 +987,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'tool-bar 'group-documentation nil)
 (custom-put-if-not 'vc-default-init-version 'custom-version "20.3")
 (custom-put-if-not 'vc-default-init-version 'standard-value t)
+(custom-put-if-not 'message-forward-show-mml 'custom-version "21.1")
+(custom-put-if-not 'message-forward-show-mml 'standard-value t)
 (custom-put-if-not 'gametree 'custom-version "20.3")
 (custom-put-if-not 'gametree 'group-documentation "Manage game analysis trees in Emacs.")
 (custom-put-if-not 'change-log-function-face 'custom-version "21.1")
@@ -1003,6 +1015,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'easy-menu-precalculate-equivalent-keybindings 'standard-value t)
 (custom-put-if-not 'debugger-batch-max-lines 'custom-version "21.1")
 (custom-put-if-not 'debugger-batch-max-lines 'standard-value t)
+(custom-put-if-not 'delete-key-deletes-forward 'custom-version "21.1")
+(custom-put-if-not 'delete-key-deletes-forward 'standard-value t)
 (custom-put-if-not 'desktop-enable 'custom-version "20.3")
 (custom-put-if-not 'desktop-enable 'standard-value t)
 (custom-put-if-not 'vc-dired-terse-display 'custom-version "20.3")
@@ -1016,7 +1030,7 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (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") ("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "frame" "uce" "mouse" "diary-lib" "sendmail" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help" "browse-url" "add-log" "find-func" "cus-edit" "replace") ("21.1" "server" "debug" "dabbrev" "gnus-start" "vc" "paths" "sgml-mode" "net-utils" "rmail" "font-lock" "gnus-nocem" "vc-hooks" "paren" "faces" "fortran" "etags" "cus-edit" "frame" "vc-sccs" "gnus-group" "gnus-sum" "files" "add-log" "find-func" "wid-edit" "vc-rcs" "nnmail" "message" "vc-cvs" "simple" "gnus-agent" "gnus-art" "browse-url" "speedbar") ("20.8" "ansi-color" "sql"))
+(defvar custom-versions-load-alist '(("20.3.3" "dos-vars") (21.1 "ange-ftp") ("20.4" "files" "help" "sh-script" "compile") ("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "frame" "uce" "mouse" "diary-lib" "sendmail" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help" "browse-url" "add-log" "find-func" "cus-edit" "replace") ("21.1" "server" "debug" "dabbrev" "gnus-start" "mule" "vc" "paths" "sgml-mode" "net-utils" "cperl-mode" "rmail" "font-lock" "gnus-nocem" "vc-hooks" "paren" "faces" "fortran" "etags" "cus-edit" "frame" "vc-sccs" "gnus-group" "gnus-sum" "files" "add-log" "find-func" "wid-edit" "vc-rcs" "nnmail" "message" "vc-cvs" "simple" "gnus-agent" "gnus-art" "browse-url" "speedbar") ("20.8" "ansi-color" "sql"))
  "For internal use by custom.")
 
 (provide 'cus-load)