1 files changed, 26 insertions, 20 deletions
diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index d762ad4427c..4d53615016b 100644
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -139,7 +139,7 @@
 (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" "artist" "goto-addr"))
+(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"))
@@ -297,7 +297,7 @@
 (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" "compile" "ebrowse" "etags" "glasses" "make-mode" "rcompile"))
+(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"))
@@ -319,7 +319,7 @@
 (put 'widget-browse 'custom-loads '("wid-browse"))
 (put 'feedmail-misc 'custom-loads '("feedmail"))
 (put 'diff 'custom-loads '("diff-mode" "diff"))
-(put 'unix 'custom-loads '("gud" "shell" "term" "sh-script" "rlogin"))
+(put 'unix 'custom-loads '("gud" "shell" "term" "rlogin" "sh-script"))
 (put 'external 'custom-loads '("bib-mode" "cus-edit" "locate" "server"))
 (put 'vc 'custom-loads '("files" "vc-hooks" "log-edit" "vc-cvs" "vc-rcs" "vc-sccs" "vc"))
 (put 'vhdl-highlight-faces 'custom-loads '("vhdl-mode"))
@@ -365,10 +365,10 @@
 (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 'eshell-term 'custom-loads '("em-term"))
 (put 'feedmail-headers 'custom-loads '("feedmail"))
-(put 'hypermedia 'custom-loads '("wid-edit" "metamail" "browse-url" "goto-addr"))
+(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"))
@@ -405,7 +405,7 @@
 (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"))
+(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"))
@@ -418,8 +418,8 @@
 (put 'ispell 'custom-loads '("ispell"))
 (put 'auto-revert 'custom-loads '("autorevert"))
 (put 'advice 'custom-loads '("advice"))
-(put 'eshell-util 'custom-loads '("esh-util"))
 (put 'picture 'custom-loads '("picture"))
+(put 'eshell-util 'custom-loads '("esh-util"))
 (put 'gnus-group 'custom-loads '("gnus-topic" "gnus"))
 (put 'eudc-bbdb 'custom-loads '("eudc-vars"))
 (put 'reftex-referencing-labels 'custom-loads '("reftex-vars"))
@@ -454,7 +454,7 @@
 (put 'bibtex 'custom-loads '("bibtex"))
 (put 'faces 'custom-loads '("loaddefs" "faces" "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" "spell" "eshell"))
+(put 'applications 'custom-loads '("calendar" "cus-edit" "uniquify" "eshell" "spell"))
 (put 'ebrowse-member 'custom-loads '("ebrowse"))
 (put 'terminal 'custom-loads '("terminal"))
 (put 'shadow 'custom-loads '("shadowfile" "shadow"))
@@ -474,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" "cus-edit" "faces" "ooutline" "hl-line" "vcursor" "whitespace" "picture" "auto-show" "hscroll"))
+(put 'editing 'custom-loads '("simple" "view" "indent" "paragraphs" "cus-edit" "faces" "outline" "hl-line" "vcursor" "whitespace" "auto-show" "hscroll" "picture"))
 (put 'crisp 'custom-loads '("crisp"))
 (put 'nroff 'custom-loads '("nroff-mode"))
 (put 'gnus-group-icons 'custom-loads '("gnus-group"))
@@ -491,7 +491,7 @@
 (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" "fortune" "eudc-vars"))
+(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"))
@@ -501,7 +501,7 @@
 (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" "ooutline" "outline"))
+(put 'outlines 'custom-loads '("allout" "outline" "ooutline"))
 (put 'latin1-display 'custom-loads '("latin1-disp"))
 (put 'paragraphs 'custom-loads '("paragraphs"))
 (put 'ebrowse 'custom-loads '("ebrowse"))
@@ -566,9 +566,9 @@
 (put 'glasses 'custom-loads '("glasses"))
 (put 'vhdl-style 'custom-loads '("vhdl-mode"))
 (put 'tempo 'custom-loads '("tempo"))
-(put 'c 'custom-loads '("tooltip" "cc-vars" "c-mode" "cmacexp" "cpp" "hideif"))
+(put 'c 'custom-loads '("tooltip" "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" "compile" "sql" "flyspell" "rcompile" "rlogin"))
+(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"))
@@ -688,6 +688,8 @@ bash, zsh, rc, 4dos; since Emacs itself is capable of handling most of
 the tasks accomplished by such tools.")
 (custom-put-if-not 'compilation-scroll-output 'custom-version "20.3")
 (custom-put-if-not 'compilation-scroll-output 'standard-value t)
+(custom-put-if-not 'vc-cvs-diff-switches 'custom-version "21.1")
+(custom-put-if-not 'vc-cvs-diff-switches 'standard-value t)
 (custom-put-if-not 'gnus-unbuttonized-mime-types 'custom-version "21.1")
 (custom-put-if-not 'gnus-unbuttonized-mime-types 'standard-value t)
 (custom-put-if-not 'vc-dired-recurse 'custom-version "20.3")
@@ -801,6 +803,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'scroll-bar 'group-documentation nil)
 (custom-put-if-not 'backward-delete-char-untabify-method 'custom-version "20.3")
 (custom-put-if-not 'backward-delete-char-untabify-method 'standard-value t)
+(custom-put-if-not 'vc-diff-switches 'custom-version "21.1")
+(custom-put-if-not 'vc-diff-switches 'standard-value t)
 (custom-put-if-not 'vcursor-interpret-input 'custom-version "20.3")
 (custom-put-if-not 'vcursor-interpret-input 'standard-value t)
 (custom-put-if-not 'gnus-audio 'custom-version "21.1")
@@ -927,8 +931,6 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'message-forward-ignored-headers 'standard-value t)
 (custom-put-if-not 'eudc 'custom-version "21.1")
 (custom-put-if-not 'eudc 'group-documentation "Emacs Unified Directory Client.")
-(custom-put-if-not 'ediff-before-setup-hook 'custom-version "21.1")
-(custom-put-if-not 'ediff-before-setup-hook 'standard-value t)
 (custom-put-if-not 'scrolling 'custom-version "21.1")
 (custom-put-if-not 'scrolling 'group-documentation "Scrolling windows.")
 (custom-put-if-not 'sh-imenu-generic-expression 'custom-version "20.4")
@@ -951,6 +953,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'custom-comment-face 'group-documentation nil)
 (custom-put-if-not 'custom-raised-buttons 'custom-version "21.1")
 (custom-put-if-not 'custom-raised-buttons 'standard-value t)
+(custom-put-if-not 'gnus-article-x-face-command 'custom-version "21.1")
+(custom-put-if-not 'gnus-article-x-face-command 'standard-value t)
 (custom-put-if-not 'gnus-inhibit-user-auto-expire 'custom-version "21.1")
 (custom-put-if-not 'gnus-inhibit-user-auto-expire 'standard-value t)
 (custom-put-if-not 'show-paren-ring-bell-on-mismatch 'custom-version "20.3")
@@ -991,6 +995,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'sql-mysql-options 'standard-value t)
 (custom-put-if-not 'next-line-add-newlines 'custom-version "21.1")
 (custom-put-if-not 'next-line-add-newlines 'standard-value t)
+(custom-put-if-not 'dabbrev-ignored-buffer-regexps 'custom-version "21.1")
+(custom-put-if-not 'dabbrev-ignored-buffer-regexps 'standard-value t)
 (custom-put-if-not 'gnus-group-highlight-words-alist 'custom-version "21.1")
 (custom-put-if-not 'gnus-group-highlight-words-alist 'standard-value t)
 (custom-put-if-not 'dabbrev-ignored-buffer-names 'custom-version "20.3")
@@ -1001,6 +1007,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'change-log-file-face 'group-documentation nil)
 (custom-put-if-not 'diary-unknown-time 'custom-version "20.3")
 (custom-put-if-not 'diary-unknown-time 'standard-value t)
+(custom-put-if-not 'vc-sccs-diff-switches 'custom-version "21.1")
+(custom-put-if-not 'vc-sccs-diff-switches '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")
@@ -1023,6 +1031,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (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 'vc-rcs-diff-switches 'custom-version "21.1")
+(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 'hscroll-global-mode 'custom-version "20.3")
@@ -1035,8 +1045,6 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'tags-apropos-verbose 'standard-value t)
 (custom-put-if-not 'mailcap 'custom-version "21.1")
 (custom-put-if-not 'mailcap 'group-documentation "Definition of viewers for MIME types.")
-(custom-put-if-not 'dabbrev-ignored-regexps 'custom-version "21.1")
-(custom-put-if-not 'dabbrev-ignored-regexps 'standard-value t)
 (custom-put-if-not 'find-variable-regexp 'custom-version "21.1")
 (custom-put-if-not 'find-variable-regexp 'standard-value t)
 (custom-put-if-not 'header-line 'custom-version "21.1")
@@ -1055,8 +1063,6 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'vc-dired-terse-display 'standard-value t)
 (custom-put-if-not 'server-kill-new-buffers 'custom-version "21.1")
 (custom-put-if-not 'server-kill-new-buffers 'standard-value t)
-(custom-put-if-not 'ediff-merge-filename-prefix 'custom-version "21.1")
-(custom-put-if-not 'ediff-merge-filename-prefix 'standard-value t)
 (custom-put-if-not 'speedbar-hide-button-brackets-flag 'custom-version "21.1")
 (custom-put-if-not 'speedbar-hide-button-brackets-flag 'standard-value t)
 (custom-put-if-not 'delphi 'custom-version "21.1")
@@ -1064,7 +1070,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" "simple" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help" "browse-url" "add-log" "find-func" "cus-edit" "replace") ("21.1" "server" "debug" "dabbrev" "isearch" "gnus-start" "mule" "vc" "ediff-init" "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" "add-log" "find-func" "wid-edit" "vc-rcs" "files" "nnmail" "message" "vc-cvs" "simple" "gnus-agent" "flyspell" "gnus-art" "browse-url" "speedbar") ("20.8" "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" "simple" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help" "browse-url" "add-log" "find-func" "cus-edit" "replace") ("21.1" "server" "debug" "dabbrev" "isearch" "gnus-start" "mule" "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" "vc-rcs" "files" "nnmail" "message" "vc-cvs" "simple" "gnus-agent" "flyspell" "gnus-art" "browse-url" "speedbar") ("20.8" "sql"))
  "For internal use by custom.")
 
 (provide 'cus-load)