*** empty log message ***

1 files changed, 59 insertions, 29 deletions

diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index 10d54e676d5..424c174e67c 100644
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -32,7 +32,7 @@
 (put 'gnus-article-headers 'custom-loads '("gnus-art" "gnus-sum"))
 (put 'f90 'custom-loads '("f90"))
 (put 'allout 'custom-loads '("allout"))
-(put 'ediff-hook 'custom-loads '("ediff-init"))
+(put 'ediff-hook 'custom-loads '("ediff-init" "ediff-mult"))
 (put 'woman-faces 'custom-loads '("woman"))
 (put 'ps-print-vertical 'custom-loads '("ps-print"))
 (put 'supercite-hooks 'custom-loads '("supercite"))
@@ -51,7 +51,7 @@
 (put 'gnus-score-kill 'custom-loads '("gnus-kill" "gnus"))
 (put 'ldap 'custom-loads '("ldap"))
 (put 'remote-compile 'custom-loads '("rcompile"))
-(put 'gnus-visual 'custom-loads '("earcon" "gnus-art" "gnus" "smiley-ems"))
+(put 'gnus-visual 'custom-loads '("earcon" "gnus-art" "gnus-audio" "gnus" "smiley-ems"))
 (put 'dabbrev 'custom-loads '("dabbrev"))
 (put 'completion 'custom-loads '("completion" "iswitchb"))
 (put 'cpp 'custom-loads '("cpp"))
@@ -154,7 +154,7 @@
 (put 'message-various 'custom-loads '("message"))
 (put 'term 'custom-loads '("terminal" "term"))
 (put 'gnus-summary-exit 'custom-loads '("gnus-sum" "gnus"))
-(put 'news 'custom-loads '("gnus" "message" "mm-decode" "supercite"))
+(put 'news 'custom-loads '("gnus" "mm-decode" "message" "supercite"))
 (put 'ada 'custom-loads '("ada-mode" "ada-xref"))
 (put 'gnus 'custom-loads '("gnus-art" "gnus-async" "gnus-demon" "gnus-dup" "gnus-eform" "gnus-undo" "gnus-uu" "gnus-win" "gnus" "mail-source" "nnmail" "rfc1843"))
 (put 'cperl-affected-by-hairy 'custom-loads '("cperl-mode"))
@@ -167,7 +167,7 @@
 (put 'paren-showing 'custom-loads '("paren"))
 (put 'dos-fns 'custom-loads '("dos-vars"))
 (put 'display-time 'custom-loads '("time"))
-(put 'multimedia 'custom-loads '("mm-decode"))
+(put 'multimedia 'custom-loads '("image" "gnus-audio" "mm-decode"))
 (put 'reftex 'custom-loads '("reftex-vars"))
 (put 'makemode 'custom-loads '("make-mode"))
 (put 'hexl 'custom-loads '("hexl"))
@@ -213,7 +213,7 @@
 (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 '("font-lock" "frame" "faces"))
+(put 'font-lock 'custom-loads '("frame" "faces" "font-lock"))
 (put 'auto-save 'custom-loads '("files" "startup"))
 (put 'tpu 'custom-loads '("tpu-edt" "tpu-extras"))
 (put 'gnus-cite 'custom-loads '("gnus-cite"))
@@ -226,7 +226,7 @@
 (put 'mh-buffer 'custom-loads '("mh-utils"))
 (put 'feedmail-queue 'custom-loads '("feedmail"))
 (put 'idlwave-misc 'custom-loads '("idlwave"))
-(put 'cmuscheme 'custom-loads '("cmuscheme" "xscheme"))
+(put 'cmuscheme 'custom-loads '("cmuscheme"))
 (put 'ansi-colors 'custom-loads '("ansi-color"))
 (put 'file-cache 'custom-loads '("filecache"))
 (put 'uce 'custom-loads '("uce"))
@@ -279,6 +279,7 @@
 (put 'tex-view 'custom-loads '("tex-mode"))
 (put 'nnmail-files 'custom-loads '("nnmail"))
 (put 'gnus-edit-form 'custom-loads '("gnus-eform"))
+(put 'gnus-audio 'custom-loads '("gnus-audio"))
 (put 'modula2 'custom-loads '("modula2"))
 (put 'ps-print-color 'custom-loads '("ps-print"))
 (put 'emacs 'custom-loads '("cus-edit" "ebnf2ps"))
@@ -294,12 +295,13 @@
 (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 '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 'viper-mouse 'custom-loads '("viper-mous"))
+(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"))
@@ -315,9 +317,9 @@
 (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" "rlogin" "sh-script"))
+(put 'unix 'custom-loads '("gud" "shell" "term" "sh-script" "rlogin"))
 (put 'external 'custom-loads '("bib-mode" "cus-edit" "locate" "server"))
-(put 'vc 'custom-loads '("files" "vc-hooks" "vc-cvs" "vc-rcs" "vc-sccs" "vc"))
+(put 'vc 'custom-loads '("files" "vc-hooks" "log-edit" "vc-cvs" "vc-rcs" "vc-sccs" "vc"))
 (put 'vhdl-highlight-faces 'custom-loads '("vhdl-mode"))
 (put 'which-func 'custom-loads '("which-func"))
 (put 'pc-select 'custom-loads '("pc-select"))
@@ -327,6 +329,7 @@
 (put 'idlwave-code-formatting 'custom-loads '("idlwave"))
 (put 'basic-faces 'custom-loads '("faces" "frame"))
 (put 'net-utils 'custom-loads '("net-utils"))
+(put 'columns 'custom-loads '("delim-col"))
 (put 'facemenu 'custom-loads '("facemenu"))
 (put 'pp 'custom-loads '("pp"))
 (put 'two-column 'custom-loads '("two-column"))
@@ -342,7 +345,7 @@
 (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" "windmove" "pc-select"))
+(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 'idlwave-routine-info 'custom-loads '("idlwave"))
 (put 'm4 'custom-loads '("m4-mode"))
@@ -360,10 +363,11 @@
 (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 'earcon 'custom-loads '("earcon"))
 (put 'feedmail-headers 'custom-loads '("feedmail"))
-(put 'hypermedia 'custom-loads '("wid-edit" "browse-url" "goto-addr" "metamail"))
+(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"))
 (put 'follow 'custom-loads '("follow"))
@@ -411,8 +415,8 @@
 (put 'ispell 'custom-loads '("ispell"))
 (put 'auto-revert 'custom-loads '("autorevert"))
 (put 'advice 'custom-loads '("advice"))
-(put 'picture 'custom-loads '("picture"))
 (put 'eshell-util 'custom-loads '("esh-util"))
+(put 'picture 'custom-loads '("picture"))
 (put 'gnus-group 'custom-loads '("gnus-topic" "gnus"))
 (put 'eudc-bbdb 'custom-loads '("eudc-vars"))
 (put 'reftex-referencing-labels 'custom-loads '("reftex-vars"))
@@ -427,7 +431,7 @@
 (put 'bibtex-autokey 'custom-loads '("bibtex"))
 (put 'eudc 'custom-loads '("eudc-vars"))
 (put 'octave 'custom-loads '("octave-inf" "octave-mod"))
-(put 'editing-basics 'custom-loads '("simple" "files" "delsel" "pc-select"))
+(put 'editing-basics 'custom-loads '("simple" "files" "pc-select"))
 (put 'hscroll 'custom-loads '("hscroll"))
 (put 'fortune-signature 'custom-loads '("fortune"))
 (put 'nnmail-expire 'custom-loads '("gnus" "nnmail"))
@@ -447,13 +451,13 @@
 (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" "eshell" "spell"))
+(put 'applications 'custom-loads '("calendar" "cus-edit" "uniquify" "spell" "eshell"))
 (put 'ebrowse-member 'custom-loads '("ebrowse"))
 (put 'terminal 'custom-loads '("terminal"))
 (put 'shadow 'custom-loads '("shadowfile" "shadow"))
 (put 'hl-line 'custom-loads '("hl-line"))
 (put 'eshell-glob 'custom-loads '("em-glob"))
-(put 'internal 'custom-loads '("startup" "cus-edit"))
+(put 'internal 'custom-loads '("startup" "cus-edit" "delim-col"))
 (put 'lisp 'custom-loads '("simple" "lisp" "lisp-mode" "cmuscheme" "ielm" "xscheme" "advice" "bytecomp" "checkdoc" "cl-indent" "cust-print" "edebug" "eldoc" "elp" "find-func" "pp" "re-builder" "shadow" "trace" "scheme"))
 (put 'local 'custom-loads '("calendar"))
 (put 'rlogin 'custom-loads '("rlogin"))
@@ -467,7 +471,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" "picture"))
+(put 'editing 'custom-loads '("simple" "view" "indent" "paragraphs" "auto-show" "cus-edit" "faces" "outline" "hl-line" "hscroll" "vcursor" "whitespace" "picture"))
 (put 'crisp 'custom-loads '("crisp"))
 (put 'nroff 'custom-loads '("nroff-mode"))
 (put 'gnus-group-icons 'custom-loads '("gnus-group"))
@@ -483,8 +487,8 @@
 (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" "imap" "message" "mm-decode" "emacsbug" "feedmail" "mail-extr" "mail-hist" "mail-utils" "mailalias" "metamail" "mh-e" "mspools" "rmail" "sendmail" "smtpmail" "supercite" "uce" "fortune"))
+(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 'paren-blinking 'custom-loads '("simple"))
 (put 'gnus-summary-sort 'custom-loads '("gnus-sum"))
 (put 'fast-lock 'custom-loads '("fast-lock"))
@@ -494,7 +498,7 @@
 (put 'dired 'custom-loads '("files" "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"))
+(put 'outlines 'custom-loads '("allout" "outline" "ooutline"))
 (put 'latin1-display 'custom-loads '("latin1-disp"))
 (put 'paragraphs 'custom-loads '("paragraphs"))
 (put 'ebrowse 'custom-loads '("ebrowse"))
@@ -559,7 +563,7 @@
 (put 'tempo 'custom-loads '("tempo"))
 (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" "rcompile" "rlogin" "metamail" "compile" "sql" "flyspell"))
+(put 'processes 'custom-loads '("ansi-color" "comint" "cus-edit" "executable" "pcomplete" "shell" "term" "metamail" "compile" "sql" "flyspell" "rcompile" "rlogin"))
 (put 'ebnf2ps 'custom-loads '("ebnf2ps"))
 (put 'sendmail 'custom-loads '("sendmail"))
 (put 'gnus-article-signature 'custom-loads '("gnus-art"))
@@ -607,10 +611,14 @@
 (custom-put-if-not 'speedbar-reconfigure-keymaps-hook 'standard-value t)
 (custom-put-if-not 'highlight-changes 'custom-version "20.4")
 (custom-put-if-not 'highlight-changes 'group-documentation "Highlight Changes mode.")
+(custom-put-if-not 'browse-url-gnome-moz-arguments 'custom-version "21.1")
+(custom-put-if-not 'browse-url-gnome-moz-arguments 'standard-value t)
 (custom-put-if-not 'query-replace-from-history-variable 'custom-version "20.3")
 (custom-put-if-not 'query-replace-from-history-variable 'standard-value t)
 (custom-put-if-not 'footnote 'custom-version "21.1")
 (custom-put-if-not 'footnote 'group-documentation "Support for footnotes in mail and news messages.")
+(custom-put-if-not 'pcomplete 'custom-version "21.1")
+(custom-put-if-not 'pcomplete 'group-documentation "Programmable completion.")
 (custom-put-if-not 'fancy-splash-screen 'custom-version "21.1")
 (custom-put-if-not 'fancy-splash-screen 'group-documentation "Fancy splash screen when Emacs starts.")
 (custom-put-if-not 'custom-variable-default-form 'custom-version "20.3")
@@ -651,6 +659,12 @@
 (custom-put-if-not 'mail-source 'group-documentation "The mail-fetching library.")
 (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")
+(custom-put-if-not 'eshell 'group-documentation "Eshell is a command shell implemented entirely in Emacs Lisp.  It
+invokes no external processes beyond those requested by the user.  It
+is intended to be a functional replacement for command shells such as
+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-dired-recurse 'custom-version "20.3")
@@ -726,12 +740,16 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'tags-apropos-additional-actions 'standard-value t)
 (custom-put-if-not 'generic-x 'custom-version "20.3")
 (custom-put-if-not 'generic-x 'group-documentation "Extra modes for generic mode.")
+(custom-put-if-not 'whitespace 'custom-version "21.1")
+(custom-put-if-not 'whitespace 'group-documentation "Check for and fix five different types of whitespaces in source code.")
 (custom-put-if-not 'debugger-mode-hook 'custom-version "20.3")
 (custom-put-if-not 'debugger-mode-hook 'standard-value t)
 (custom-put-if-not 'scroll-bar 'custom-version "21.1")
 (custom-put-if-not 'scroll-bar 'group-documentation nil)
 (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")
+(custom-put-if-not 'gnus-audio 'group-documentation "Playing sound in Gnus.")
 (custom-put-if-not 'trailing-whitespace 'custom-version "21.1")
 (custom-put-if-not 'trailing-whitespace 'group-documentation nil)
 (custom-put-if-not 'fortran-comment-line-start 'custom-version "21.1")
@@ -744,6 +762,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'vhdl 'group-documentation "Customizations for VHDL Mode.")
 (custom-put-if-not 'show-paren-priority 'custom-version "21.1")
 (custom-put-if-not 'show-paren-priority 'standard-value t)
+(custom-put-if-not 'isearch-faces 'custom-version "21.1")
+(custom-put-if-not 'isearch-faces 'group-documentation "Lazy highlighting feature for incremental search.")
 (custom-put-if-not 'vc-handled-backends 'custom-version "21.1")
 (custom-put-if-not 'vc-handled-backends 'standard-value t)
 (custom-put-if-not 'find-function-recenter-line 'custom-version "20.3")
@@ -754,6 +774,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'change-log-list-face 'group-documentation nil)
 (custom-put-if-not 'vc-rcs-register-switches 'custom-version "21.1")
 (custom-put-if-not 'vc-rcs-register-switches 'standard-value t)
+(custom-put-if-not 'gnus-nocem-check-article-limit 'custom-version "21.1")
+(custom-put-if-not 'gnus-nocem-check-article-limit 'standard-value t)
 (custom-put-if-not 'mail-citation-prefix-regexp 'custom-version "20.3")
 (custom-put-if-not 'mail-citation-prefix-regexp 'standard-value t)
 (custom-put-if-not 'diary-mail-days 'custom-version "20.3")
@@ -780,6 +802,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'eval-expression-print-length 'standard-value t)
 (custom-put-if-not 'net-utils 'custom-version "20.3")
 (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 '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")
@@ -796,16 +820,16 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'change-log-version-number-regexp-list 'standard-value t)
 (custom-put-if-not 'menu 'custom-version "21.1")
 (custom-put-if-not 'menu 'group-documentation "Input from the menus.")
+(custom-put-if-not 'gnus-nocem-check-from 'custom-version "21.1")
+(custom-put-if-not 'gnus-nocem-check-from 'standard-value t)
 (custom-put-if-not 'sgml-validate-command 'custom-version "21.1")
 (custom-put-if-not 'sgml-validate-command 'standard-value t)
 (custom-put-if-not 'jit-lock 'custom-version "21.1")
 (custom-put-if-not 'jit-lock 'group-documentation "Font Lock support mode to fontify just-in-time.")
-(custom-put-if-not 'temp-buffer-resize-mode 'custom-version "20.4")
-(custom-put-if-not 'temp-buffer-resize-mode 'standard-value t)
-(custom-put-if-not 'bs 'custom-version "21.1")
-(custom-put-if-not 'bs 'group-documentation "Buffer Selection: Maintaining buffers by buffer menu.")
 (custom-put-if-not 'rmail-file-name 'custom-version "21.1")
 (custom-put-if-not 'rmail-file-name 'standard-value t)
+(custom-put-if-not 'bs 'custom-version "21.1")
+(custom-put-if-not 'bs 'group-documentation "Buffer Selection: Maintaining buffers by buffer menu.")
 (custom-put-if-not 'cperl 'custom-version "20.3")
 (custom-put-if-not 'cperl 'group-documentation "Major mode for editing Perl code.")
 (custom-put-if-not 'focus-follows-mouse 'custom-version "20.3")
@@ -828,6 +852,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'change-log-acknowledgement-face 'group-documentation nil)
 (custom-put-if-not 'mail-abbrevs-mode 'custom-version "20.3")
 (custom-put-if-not 'mail-abbrevs-mode '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 '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")
@@ -854,6 +880,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 'sql-sybase-options 'custom-version "20.8")
+(custom-put-if-not 'sql-sybase-options 'standard-value t)
 (custom-put-if-not 'recentf 'custom-version "21.1")
 (custom-put-if-not 'recentf 'group-documentation "Maintain a menu of recently opened files.")
 (custom-put-if-not 'fortune 'custom-version "21.1")
@@ -861,7 +889,9 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'dired-at-point-require-prefix 'custom-version "20.3")
 (custom-put-if-not 'dired-at-point-require-prefix 'standard-value t)
 (custom-put-if-not 'diff-mode 'custom-version "21.1")
-(custom-put-if-not 'diff-mode 'group-documentation "Major-mode for viewing/editing diffs")
+(custom-put-if-not 'diff-mode 'group-documentation "Major mode for viewing/editing diffs")
+(custom-put-if-not 'sql-mysql-options 'custom-version "20.8")
+(custom-put-if-not 'sql-mysql-options 'standard-value t)
 (custom-put-if-not 'dabbrev-ignored-buffer-names 'custom-version "20.3")
 (custom-put-if-not 'dabbrev-ignored-buffer-names 'standard-value t)
 (custom-put-if-not 'change-log-file-face 'custom-version "21.1")
@@ -890,7 +920,7 @@ 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 '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 "20.3")
+(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")
 (custom-put-if-not 'header-line 'group-documentation nil)
@@ -913,7 +943,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" "sh-script" "help" "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" "vc" "paths" "sgml-mode" "net-utils" "font-lock" "vc-hooks" "paren" "fortran" "etags" "cus-edit" "frame" "vc-sccs" "files" "add-log" "find-func" "wid-edit" "vc-rcs" "vc-cvs" "simple" "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" "vc" "paths" "sgml-mode" "net-utils" "font-lock" "gnus-nocem" "vc-hooks" "paren" "fortran" "etags" "cus-edit" "frame" "vc-sccs" "files" "add-log" "find-func" "wid-edit" "vc-rcs" "vc-cvs" "simple" "browse-url" "speedbar") ("20.8" "ansi-color" "sql"))
  "For internal use by custom.")
 
 (provide 'cus-load)