diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index 3755abb2eb4..10d54e676d5 100644
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -2,8 +2,8 @@
 ;;
 ;;; Code:
 
-(put 'holidays 'custom-loads '("calendar"))
 (put 'mime-display 'custom-loads '("mm-decode"))
+(put 'holidays 'custom-loads '("calendar"))
 (put 'SQL 'custom-loads '("sql"))
 (put 'refbib 'custom-loads '("refbib"))
 (put 'elp 'custom-loads '("elp"))
@@ -32,13 +32,13 @@
 (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" "ediff-mult"))
+(put 'ediff-hook 'custom-loads '("ediff-init"))
 (put 'woman-faces 'custom-loads '("woman"))
 (put 'ps-print-vertical 'custom-loads '("ps-print"))
 (put 'supercite-hooks 'custom-loads '("supercite"))
 (put 'vhdl-menu 'custom-loads '("vhdl-mode"))
-(put 'chinese-calendar 'custom-loads '("cal-china"))
 (put 'gnus-newsrc 'custom-loads '("gnus-start"))
+(put 'chinese-calendar 'custom-loads '("cal-china"))
 (put 'expand 'custom-loads '("expand"))
 (put 'bookmark 'custom-loads '("bookmark"))
 (put 'icon 'custom-loads '("icon"))
@@ -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-audio" "gnus" "smiley-ems"))
+(put 'gnus-visual 'custom-loads '("earcon" "gnus-art" "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" "mm-decode" "message" "supercite"))
+(put 'news 'custom-loads '("gnus" "message" "mm-decode" "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 '("image" "gnus-audio" "mm-decode"))
+(put 'multimedia 'custom-loads '("mm-decode"))
 (put 'reftex 'custom-loads '("reftex-vars"))
 (put 'makemode 'custom-loads '("make-mode"))
 (put 'hexl 'custom-loads '("hexl"))
@@ -216,8 +216,8 @@
 (put 'font-lock 'custom-loads '("font-lock" "frame" "faces"))
 (put 'auto-save 'custom-loads '("files" "startup"))
 (put 'tpu 'custom-loads '("tpu-edt" "tpu-extras"))
-(put 'viper-hooks 'custom-loads '("viper-init"))
 (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"))
@@ -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"))
+(put 'cmuscheme 'custom-loads '("cmuscheme" "xscheme"))
 (put 'ansi-colors 'custom-loads '("ansi-color"))
 (put 'file-cache 'custom-loads '("filecache"))
 (put 'uce 'custom-loads '("uce"))
@@ -269,7 +269,7 @@
 (put 'generic-x 'custom-loads '("generic-x"))
 (put 'partial-completion 'custom-loads '("complete"))
 (put 'whitespace 'custom-loads '("whitespace"))
-(put 'maint 'custom-loads '("emacsbug" "gulp" "lisp-mnt"))
+(put 'maint 'custom-loads '("gulp" "lisp-mnt" "emacsbug"))
 (put 'pages 'custom-loads '("page-ext"))
 (put 'message-interface 'custom-loads '("message"))
 (put 'diary 'custom-loads '("calendar" "diary-lib"))
@@ -279,7 +279,6 @@
 (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"))
@@ -295,13 +294,12 @@
 (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 '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 '("simple" "chistory" "type-break"))
-(put 'isearch-faces 'custom-loads '("isearch"))
-(put 'eshell-hist 'custom-loads '("em-hist"))
 (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"))
@@ -319,7 +317,7 @@
 (put 'diff 'custom-loads '("diff-mode" "diff"))
 (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 'vc 'custom-loads '("files" "vc-hooks" "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"))
@@ -329,7 +327,6 @@
 (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"))
@@ -345,7 +342,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" "whitespace" "windmove" "pc-select"))
+(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 'lm 'custom-loads '("landmark"))
 (put 'idlwave-routine-info 'custom-loads '("idlwave"))
 (put 'm4 'custom-loads '("m4-mode"))
@@ -363,11 +360,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 'image 'custom-loads '("image-file"))
+(put 'hypermedia 'custom-loads '("wid-edit" "browse-url" "goto-addr" "metamail"))
 (put 'ff 'custom-loads '("find-file"))
 (put 'prolog 'custom-loads '("prolog"))
 (put 'follow 'custom-loads '("follow"))
@@ -431,7 +427,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" "pc-select"))
+(put 'editing-basics 'custom-loads '("simple" "files" "delsel" "pc-select"))
 (put 'hscroll 'custom-loads '("hscroll"))
 (put 'fortune-signature 'custom-loads '("fortune"))
 (put 'nnmail-expire 'custom-loads '("gnus" "nnmail"))
@@ -457,7 +453,7 @@
 (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" "delim-col"))
+(put 'internal 'custom-loads '("startup" "cus-edit"))
 (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"))
@@ -471,7 +467,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" "auto-show" "cus-edit" "faces" "outline" "hl-line" "hscroll" "vcursor" "picture"))
 (put 'crisp 'custom-loads '("crisp"))
 (put 'nroff 'custom-loads '("nroff-mode"))
 (put 'gnus-group-icons 'custom-loads '("gnus-group"))
@@ -487,8 +483,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" "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" "eudc-vars" "fortune"))
+(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 'paren-blinking 'custom-loads '("simple"))
 (put 'gnus-summary-sort 'custom-loads '("gnus-sum"))
 (put 'fast-lock 'custom-loads '("fast-lock"))
@@ -498,7 +494,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" "ooutline"))
+(put 'outlines 'custom-loads '("allout" "outline"))
 (put 'latin1-display 'custom-loads '("latin1-disp"))
 (put 'paragraphs 'custom-loads '("paragraphs"))
 (put 'ebrowse 'custom-loads '("ebrowse"))
@@ -563,7 +559,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" "metamail" "rcompile" "rlogin" "compile" "sql" "flyspell"))
+(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"))
@@ -611,14 +607,10 @@
 (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")
@@ -659,12 +651,6 @@
 (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")
@@ -740,16 +726,12 @@ 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")
@@ -762,8 +744,6 @@ 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")
@@ -774,8 +754,6 @@ 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")
@@ -802,8 +780,6 @@ 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")
@@ -820,16 +796,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 'rmail-file-name 'custom-version "21.1")
-(custom-put-if-not 'rmail-file-name 'standard-value t)
+(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 '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")
@@ -852,8 +828,6 @@ 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")
@@ -880,8 +854,6 @@ 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")
@@ -889,9 +861,7 @@ 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 'sql-mysql-options 'custom-version "20.8")
-(custom-put-if-not 'sql-mysql-options 'standard-value t)
+(custom-put-if-not 'diff-mode 'group-documentation "Major-mode for viewing/editing diffs")
 (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")
@@ -920,7 +890,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 "21.1")
+(custom-put-if-not 'find-variable-regexp 'custom-version "20.3")
 (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)
@@ -943,7 +913,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" "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"))
+(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"))
  "For internal use by custom.")
 
 (provide 'cus-load)
diff --git a/lisp/eshell/esh-groups.el b/lisp/eshell/esh-groups.el
index 218bd2a2e52..d82cdff4ffd 100644
--- a/lisp/eshell/esh-groups.el
+++ b/lisp/eshell/esh-groups.el
@@ -132,4 +132,3 @@ functions, or as aliases which make some of Emacs' behavior more
 naturally accessible within Emacs."
   :tag "Extra alias functions"
   :group 'eshell-module)
-
diff --git a/lisp/loaddefs.el b/lisp/loaddefs.el
index 3e97fe2ac18..26cee0b0c63 100644
--- a/lisp/loaddefs.el
+++ b/lisp/loaddefs.el
@@ -52,7 +52,7 @@ should return a grid vector array that is the new solution." t nil)
 ;;;***
 
 ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el"
-;;;;;;  (14821 39610))
+;;;;;;  (14816 63829))
 ;;; Generated autoloads from progmodes/ada-mode.el
 
 (autoload (quote ada-add-extensions) "ada-mode" "\
@@ -108,7 +108,7 @@ If you use ada-xref.el:
 ;;;***
 
 ;;;### (autoloads (ada-header) "ada-stmt" "progmodes/ada-stmt.el"
-;;;;;;  (14821 39610))
+;;;;;;  (14816 63829))
 ;;; Generated autoloads from progmodes/ada-stmt.el
 
 (autoload (quote ada-header) "ada-stmt" "\
@@ -309,7 +309,7 @@ See Info node `(elisp)Advising Functions' for comprehensive documentation." nil
 
 ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule
 ;;;;;;  align-highlight-rule align-current align-entire align-regexp
-;;;;;;  align) "align" "align.el" (14824 37432))
+;;;;;;  align) "align" "align.el" (14823 8292))
 ;;; Generated autoloads from align.el
 
 (autoload (quote align) "align" "\
@@ -473,8 +473,8 @@ They specify the range of dates that the diary is being processed for." nil nil)
 ;;;***
 
 ;;;### (autoloads (apropos-documentation apropos-value apropos apropos-command
-;;;;;;  apropos-variable apropos-mode) "apropos" "apropos.el" (14813
-;;;;;;  54515))
+;;;;;;  apropos-variable apropos-mode) "apropos" "apropos.el" (14811
+;;;;;;  51864))
 ;;; Generated autoloads from apropos.el
 
 (autoload (quote apropos-mode) "apropos" "\
@@ -518,8 +518,8 @@ Returns list of symbols and documentation found." t nil)
 
 ;;;***
 
-;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (14829
-;;;;;;  51484))
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (14825
+;;;;;;  31071))
 ;;; Generated autoloads from arc-mode.el
 
 (autoload (quote archive-mode) "arc-mode" "\
@@ -634,7 +634,7 @@ Special commands:
 ;;;***
 
 ;;;### (autoloads (batch-update-authors authors) "authors" "emacs-lisp/authors.el"
-;;;;;;  (14840 12752))
+;;;;;;  (14839 20377))
 ;;; Generated autoloads from emacs-lisp/authors.el
 
 (autoload (quote authors) "authors" "\
@@ -881,7 +881,7 @@ Vectors work just like lists.  Nested backquotes are permitted." nil (quote macr
 ;;;***
 
 ;;;### (autoloads (display-battery battery) "battery" "battery.el"
-;;;;;;  (14821 39589))
+;;;;;;  (14818 62640))
 ;;; Generated autoloads from battery.el
 
 (autoload (quote battery) "battery" "\
@@ -1393,7 +1393,7 @@ corresponding bookmark function from Lisp (the one without the
 ;;;;;;  browse-url-of-dired-file browse-url-of-buffer browse-url-of-file
 ;;;;;;  browse-url-generic-program browse-url-save-file browse-url-netscape-display
 ;;;;;;  browse-url-new-window-p browse-url-browser-function) "browse-url"
-;;;;;;  "net/browse-url.el" (14821 39609))
+;;;;;;  "net/browse-url.el" (14815 49999))
 ;;; Generated autoloads from net/browse-url.el
 
 (defvar browse-url-browser-function (if (eq system-type (quote windows-nt)) (quote browse-url-default-windows-browser) (quote browse-url-netscape)) "\
@@ -1641,7 +1641,7 @@ name of buffer configuration." t nil)
 ;;;### (autoloads (batch-byte-recompile-directory batch-byte-compile
 ;;;;;;  display-call-tree byte-compile compile-defun byte-compile-file
 ;;;;;;  byte-recompile-directory byte-force-recompile) "bytecomp"
-;;;;;;  "emacs-lisp/bytecomp.el" (14837 23159))
+;;;;;;  "emacs-lisp/bytecomp.el" (14836 4663))
 ;;; Generated autoloads from emacs-lisp/bytecomp.el
 
 (autoload (quote byte-force-recompile) "bytecomp" "\
@@ -2799,7 +2799,7 @@ Encode the text in the current buffer to HZ." t nil)
 ;;;***
 
 ;;;### (autoloads (command-history list-command-history repeat-matching-complex-command)
-;;;;;;  "chistory" "chistory.el" (14821 39589))
+;;;;;;  "chistory" "chistory.el" (14819 42852))
 ;;; Generated autoloads from chistory.el
 
 (autoload (quote repeat-matching-complex-command) "chistory" "\
@@ -2873,8 +2873,8 @@ For use inside Lisp programs, see also `c-macro-expansion'." t nil)
 
 ;;;***
 
-;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (14837
-;;;;;;  23155))
+;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (14831
+;;;;;;  12714))
 ;;; Generated autoloads from cmuscheme.el
 
 (autoload (quote run-scheme) "cmuscheme" "\
@@ -2937,7 +2937,7 @@ read/written by MS-DOS software, or for display on the MS-DOS terminal." t nil)
 ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list
 ;;;;;;  comint-redirect-send-command-to-process comint-redirect-send-command
 ;;;;;;  comint-run make-comint make-comint-in-buffer) "comint" "comint.el"
-;;;;;;  (14841 53026))
+;;;;;;  (14841 19790))
 ;;; Generated autoloads from comint.el
 
 (autoload (quote make-comint-in-buffer) "comint" "\
@@ -3017,7 +3017,7 @@ If `compare-ignore-case' is non-nil, changes in case are also ignored." t nil)
 ;;;### (autoloads (next-error compilation-minor-mode compilation-shell-minor-mode
 ;;;;;;  compilation-mode grep-find grep compile compilation-search-path
 ;;;;;;  compilation-ask-about-save compilation-window-height compilation-mode-hook)
-;;;;;;  "compile" "progmodes/compile.el" (14813 54523))
+;;;;;;  "compile" "progmodes/compile.el" (14813 6115))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -3427,7 +3427,7 @@ Insert a copyright by $ORGANIZATION notice at cursor." t nil)
 ;;;***
 
 ;;;### (autoloads (cperl-mode) "cperl-mode" "progmodes/cperl-mode.el"
-;;;;;;  (14840 12757))
+;;;;;;  (14838 60190))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 
 (autoload (quote cperl-mode) "cperl-mode" "\
@@ -3678,7 +3678,7 @@ INHERIT-INPUT-METHOD." nil nil)
 ;;;;;;  customize-option-other-window customize-changed-options customize-option
 ;;;;;;  customize-group-other-window customize-group customize customize-save-variable
 ;;;;;;  customize-set-variable customize-set-value) "cus-edit" "cus-edit.el"
-;;;;;;  (14841 53026))
+;;;;;;  (14841 19790))
 ;;; Generated autoloads from cus-edit.el
  (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'")
 
@@ -4139,8 +4139,8 @@ The most useful commands are:
 ;;;***
 
 ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region
-;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (14840
-;;;;;;  12750))
+;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (14838
+;;;;;;  45509))
 ;;; Generated autoloads from delim-col.el
 
 (autoload (quote delimit-columns-customize) "delim-col" "\
@@ -4207,8 +4207,8 @@ no args, if that value is non-nil." t nil)
 
 ;;;***
 
-;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (14811
-;;;;;;  29879))
+;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (14807
+;;;;;;  56558))
 ;;; Generated autoloads from delsel.el
 
 (defalias (quote pending-delete-mode) (quote delete-selection-mode))
@@ -4247,7 +4247,7 @@ the first time the mode is used." nil nil)
 ;;;***
 
 ;;;### (autoloads (desktop-load-default desktop-read) "desktop" "desktop.el"
-;;;;;;  (14824 37433))
+;;;;;;  (14822 58259))
 ;;; Generated autoloads from desktop.el
 
 (autoload (quote desktop-read) "desktop" "\
@@ -4322,7 +4322,7 @@ Decompose Devanagari characters in the region to IS 13194 characters." t nil)
 ;;;***
 
 ;;;### (autoloads (diary-mail-entries diary) "diary-lib" "calendar/diary-lib.el"
-;;;;;;  (14824 37434))
+;;;;;;  (14821 46405))
 ;;; Generated autoloads from calendar/diary-lib.el
 
 (autoload (quote diary) "diary-lib" "\
@@ -4381,7 +4381,7 @@ The backup file is the first file given to `diff'." t nil)
 ;;;***
 
 ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "diff-mode.el"
-;;;;;;  (14837 23156))
+;;;;;;  (14831 12714))
 ;;; Generated autoloads from diff-mode.el
 
 (autoload (quote diff-mode) "diff-mode" "\
@@ -4401,7 +4401,7 @@ Minor mode for viewing/editing context diffs.
 ;;;;;;  dired dired-copy-preserve-time dired-dwim-target dired-keep-marker-symlink
 ;;;;;;  dired-keep-marker-hardlink dired-keep-marker-copy dired-keep-marker-rename
 ;;;;;;  dired-trivial-filenames dired-ls-F-marks-symlinks dired-listing-switches)
-;;;;;;  "dired" "dired.el" (14837 23156))
+;;;;;;  "dired" "dired.el" (14831 34695))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches "-al" "\
@@ -4505,7 +4505,7 @@ Like `dired' but returns the dired buffer as value, does not select it." nil nil
 ;;;;;;  dired-do-compress dired-compress-file dired-do-kill-lines
 ;;;;;;  dired-do-shell-command dired-do-print dired-do-chown dired-do-chgrp
 ;;;;;;  dired-do-chmod dired-backup-diff dired-diff) "dired-aux"
-;;;;;;  "dired-aux.el" (14813 54515))
+;;;;;;  "dired-aux.el" (14811 51864))
 ;;; Generated autoloads from dired-aux.el
 
 (autoload (quote dired-diff) "dired-aux" "\
@@ -4736,7 +4736,7 @@ buffer and try again." t nil)
 
 ;;;***
 
-;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (14837 23156))
+;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (14831 12714))
 ;;; Generated autoloads from dirtrack.el
 
 (autoload (quote dirtrack) "dirtrack" "\
@@ -4860,7 +4860,7 @@ Default is 2." t nil)
 
 ;;;***
 
-;;;### (autoloads (doctor) "doctor" "play/doctor.el" (14837 23160))
+;;;### (autoloads (doctor) "doctor" "play/doctor.el" (14831 613))
 ;;; Generated autoloads from play/doctor.el
 
 (autoload (quote doctor) "doctor" "\
@@ -4909,7 +4909,7 @@ Play sounds in message buffers." t nil)
 
 ;;;### (autoloads (define-derived-mode easy-mmode-defsyntax easy-mmode-defmap
 ;;;;;;  easy-mmode-define-keymap easy-mmode-define-global-mode define-minor-mode)
-;;;;;;  "easy-mmode" "emacs-lisp/easy-mmode.el" (14842 44483))
+;;;;;;  "easy-mmode" "emacs-lisp/easy-mmode.el" (14842 29274))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
 (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode))
@@ -5360,7 +5360,7 @@ or if an error occurs, leave point after it with mark at the original point." t
 ;;;;;;  ediff-merge-directory-revisions ediff-merge-directories-with-ancestor
 ;;;;;;  ediff-merge-directories ediff-directories3 ediff-directory-revisions
 ;;;;;;  ediff-directories ediff-buffers3 ediff-buffers ediff-files3
-;;;;;;  ediff-files) "ediff" "ediff.el" (14844 3034))
+;;;;;;  ediff-files) "ediff" "ediff.el" (14522 27408))
 ;;; Generated autoloads from ediff.el
 
 (autoload (quote ediff-files) "ediff" "\
@@ -5543,7 +5543,7 @@ With optional NODE, goes to that node." t nil)
 ;;;***
 
 ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el"
-;;;;;;  (14844 3034))
+;;;;;;  (14636 62704))
 ;;; Generated autoloads from ediff-mult.el
 
 (autoload (quote ediff-show-registry) "ediff-mult" "\
@@ -5554,7 +5554,7 @@ Display Ediff's registry." t nil)
 ;;;***
 
 ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
-;;;;;;  "ediff-util" "ediff-util.el" (14844 3034))
+;;;;;;  "ediff-util" "ediff-util.el" (14367 2134))
 ;;; Generated autoloads from ediff-util.el
 
 (autoload (quote ediff-toggle-multiframe) "ediff-util" "\
@@ -5853,8 +5853,8 @@ Commands:
 
 ;;;***
 
-;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (14844
-;;;;;;  3060))
+;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (14828
+;;;;;;  11553))
 ;;; Generated autoloads from eshell/esh-mode.el
 
 (autoload (quote eshell-mode) "esh-mode" "\
@@ -5864,8 +5864,8 @@ Emacs shell interactive mode.
 
 ;;;***
 
-;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (14844
-;;;;;;  3060))
+;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (14827
+;;;;;;  38210))
 ;;; Generated autoloads from eshell/esh-test.el
 
 (autoload (quote eshell-test) "esh-test" "\
@@ -5874,7 +5874,7 @@ Test Eshell to verify that it works as expected." t nil)
 ;;;***
 
 ;;;### (autoloads (eshell-report-bug eshell-command-result eshell-command
-;;;;;;  eshell) "eshell" "eshell/eshell.el" (14824 37435))
+;;;;;;  eshell) "eshell" "eshell/eshell.el" (14823 8292))
 ;;; Generated autoloads from eshell/eshell.el
 
 (autoload (quote eshell) "eshell" "\
@@ -5908,8 +5908,8 @@ Please include any configuration details that might be involved." t nil)
 ;;;;;;  pop-tag-mark find-tag-regexp find-tag-other-frame find-tag-other-window
 ;;;;;;  find-tag find-tag-noselect tags-table-files visit-tags-table
 ;;;;;;  find-tag-default-function find-tag-hook tags-add-tables tags-table-list
-;;;;;;  tags-case-fold-search) "etags" "progmodes/etags.el" (14821
-;;;;;;  39611))
+;;;;;;  tags-case-fold-search) "etags" "progmodes/etags.el" (14817
+;;;;;;  11667))
 ;;; Generated autoloads from progmodes/etags.el
 
 (defvar tags-file-name nil "\
@@ -7017,7 +7017,7 @@ to get the effect of a C-q." nil nil)
 
 ;;;### (autoloads (flyspell-mode-off flyspell-mode flyspell-prog-mode
 ;;;;;;  flyspell-mode-line-string) "flyspell" "textmodes/flyspell.el"
-;;;;;;  (14844 3061))
+;;;;;;  (14720 7116))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (defvar flyspell-mode-line-string " Fly" "\
@@ -7136,7 +7136,7 @@ in your `~/.emacs' file, replacing [f7] by your favourite key:
 ;;;### (autoloads (font-lock-fontify-buffer global-font-lock-mode
 ;;;;;;  global-font-lock-mode font-lock-remove-keywords font-lock-add-keywords
 ;;;;;;  turn-on-font-lock font-lock-mode) "font-lock" "font-lock.el"
-;;;;;;  (14829 51485))
+;;;;;;  (14829 31693))
 ;;; Generated autoloads from font-lock.el
 
 (make-variable-buffer-local (quote font-lock-defaults))
@@ -7261,7 +7261,7 @@ Fontify the current buffer the way the function `font-lock-mode' would." t nil)
 ;;;***
 
 ;;;### (autoloads (create-fontset-from-fontset-spec) "fontset" "international/fontset.el"
-;;;;;;  (14830 55572))
+;;;;;;  (14830 53156))
 ;;; Generated autoloads from international/fontset.el
 
 (autoload (quote create-fontset-from-fontset-spec) "fontset" "\
@@ -7471,7 +7471,7 @@ at places they belong to." t nil)
 ;;;***
 
 ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
-;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (14842 44484))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (14842 10645))
 ;;; Generated autoloads from gnus/gnus.el
 
 (autoload (quote gnus-slave-no-server) "gnus" "\
@@ -7501,7 +7501,7 @@ prompt the user for the name of an NNTP server to use." t nil)
 
 ;;;### (autoloads (gnus-agent-batch gnus-agent-batch-fetch gnus-agentize
 ;;;;;;  gnus-plugged gnus-unplugged) "gnus-agent" "gnus/gnus-agent.el"
-;;;;;;  (14842 44483))
+;;;;;;  (14842 10643))
 ;;; Generated autoloads from gnus/gnus-agent.el
 
 (autoload (quote gnus-unplugged) "gnus-agent" "\
@@ -7529,7 +7529,7 @@ Start Gnus and fetch session." t nil)
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (14844 3061))
+;;;;;;  (14842 36876))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload (quote gnus-article-prepare-display) "gnus-art" "\
@@ -7538,7 +7538,7 @@ Make the current buffer look like a nice article." nil nil)
 ;;;***
 
 ;;;### (autoloads (gnus-audio-play) "gnus-audio" "gnus/gnus-audio.el"
-;;;;;;  (14814 20761))
+;;;;;;  (14813 58974))
 ;;; Generated autoloads from gnus/gnus-audio.el
 
 (autoload (quote gnus-audio-play) "gnus-audio" "\
@@ -7579,7 +7579,7 @@ Pop up a frame and enter GROUP." t nil)
 ;;;***
 
 ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el"
-;;;;;;  (14813 54522))
+;;;;;;  (14813 6105))
 ;;; Generated autoloads from gnus/gnus-kill.el
 
 (defalias (quote gnus-batch-kill) (quote gnus-batch-score))
@@ -7694,7 +7694,7 @@ the Gcc: header for archiving purposes." t nil)
 ;;;***
 
 ;;;### (autoloads (gnus-mule-add-group) "gnus-mule" "gnus/gnus-mule.el"
-;;;;;;  (14842 44484))
+;;;;;;  (14842 10645))
 ;;; Generated autoloads from gnus/gnus-mule.el
 
 (autoload (quote gnus-mule-add-group) "gnus-mule" "\
@@ -7737,7 +7737,7 @@ Update the format specification near point." t nil)
 ;;;***
 
 ;;;### (autoloads (gnus-declare-backend gnus-unload) "gnus-start"
-;;;;;;  "gnus/gnus-start.el" (14841 53041))
+;;;;;;  "gnus/gnus-start.el" (14841 19792))
 ;;; Generated autoloads from gnus/gnus-start.el
 
 (autoload (quote gnus-unload) "gnus-start" "\
@@ -7927,7 +7927,7 @@ Provide help for current mode." t nil)
 ;;;***
 
 ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl"
-;;;;;;  "hexl.el" (14821 39603))
+;;;;;;  "hexl.el" (14821 33060))
 ;;; Generated autoloads from hexl.el
 
 (autoload (quote hexl-mode) "hexl" "\
@@ -8432,7 +8432,7 @@ Usually run by inclusion in `minibuffer-setup-hook'." nil nil)
 
 ;;;***
 
-;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (14821 39611))
+;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (14816 63837))
 ;;; Generated autoloads from progmodes/icon.el
 
 (autoload (quote icon-mode) "icon" "\
@@ -8611,7 +8611,7 @@ The main features of this mode are
 
 ;;;***
 
-;;;### (autoloads (ielm) "ielm" "ielm.el" (14821 39603))
+;;;### (autoloads (ielm) "ielm" "ielm.el" (14819 42852))
 ;;; Generated autoloads from ielm.el
  (add-hook 'same-window-buffer-names "*ielm*")
 
@@ -8623,7 +8623,7 @@ Switches to the buffer `*ielm*', or creates it if it does not exist." t nil)
 
 ;;;### (autoloads (defimage find-image remove-images insert-image
 ;;;;;;  put-image create-image image-type-available-p image-type-from-file-header
-;;;;;;  image-type-from-data) "image" "image.el" (14813 54516))
+;;;;;;  image-type-from-data) "image" "image.el" (14812 24473))
 ;;; Generated autoloads from image.el
 
 (autoload (quote image-type-from-data) "image" "\
@@ -8720,7 +8720,7 @@ Example:
 
 ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp
 ;;;;;;  image-file-name-regexps image-file-name-extensions) "image-file"
-;;;;;;  "image-file.el" (14824 37433))
+;;;;;;  "image-file.el" (14822 58259))
 ;;; Generated autoloads from image-file.el
 
 (defvar image-file-name-extensions (quote ("png" "jpeg" "jpg" "gif" "tiff" "xbm" "xpm" "pbm")) "\
@@ -8914,7 +8914,7 @@ for more information." t nil)
 ;;;***
 
 ;;;### (autoloads (inferior-lisp) "inf-lisp" "progmodes/inf-lisp.el"
-;;;;;;  (14821 39611))
+;;;;;;  (14819 42855))
 ;;; Generated autoloads from progmodes/inf-lisp.el
 
 (defvar inferior-lisp-filter-regexp "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'" "\
@@ -8970,7 +8970,7 @@ of `inferior-lisp-program').  Runs the hooks from
 
 ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node
 ;;;;;;  Info-goto-emacs-command-node Info-directory info-standalone
-;;;;;;  info info-other-window) "info" "info.el" (14844 3035))
+;;;;;;  info info-other-window) "info" "info.el" (14836 27426))
 ;;; Generated autoloads from info.el
 
 (autoload (quote info-other-window) "info" "\
@@ -9216,7 +9216,7 @@ Add submenus to the Files menu, to convert to and from various formats." t nil)
 ;;;;;;  ispell-region ispell-change-dictionary ispell-kill-ispell
 ;;;;;;  ispell-help ispell-word ispell-dictionary-alist ispell-local-dictionary-alist
 ;;;;;;  ispell-personal-dictionary) "ispell" "textmodes/ispell.el"
-;;;;;;  (14837 23162))
+;;;;;;  (14832 14721))
 ;;; Generated autoloads from textmodes/ispell.el
 
 (defconst xemacsp (string-match "Lucid\\|XEmacs" emacs-version) "\
@@ -9460,7 +9460,7 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 ;;;### (autoloads (iswitchb-mode iswitchb-buffer-other-frame iswitchb-display-buffer
 ;;;;;;  iswitchb-buffer-other-window iswitchb-buffer iswitchb-default-keybindings
 ;;;;;;  iswitchb-read-buffer iswitchb-mode) "iswitchb" "iswitchb.el"
-;;;;;;  (14821 39605))
+;;;;;;  (14816 63828))
 ;;; Generated autoloads from iswitchb.el
 
 (defvar iswitchb-mode nil "\
@@ -9578,7 +9578,7 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading." nil
 ;;;***
 
 ;;;### (autoloads (jit-lock-register) "jit-lock" "jit-lock.el" (14829
-;;;;;;  51485))
+;;;;;;  31693))
 ;;; Generated autoloads from jit-lock.el
 
 (autoload (quote jit-lock-register) "jit-lock" "\
@@ -9590,7 +9590,7 @@ If non-nil, CONTEXTUAL means that a contextual fontification would be useful." n
 ;;;***
 
 ;;;### (autoloads (with-auto-compression-mode auto-compression-mode)
-;;;;;;  "jka-compr" "jka-compr.el" (14829 51485))
+;;;;;;  "jka-compr" "jka-compr.el" (14825 37999))
 ;;; Generated autoloads from jka-compr.el
 
 (defvar auto-compression-mode nil "\
@@ -9727,7 +9727,7 @@ The return value is number of composed characters." nil nil)
 ;;;***
 
 ;;;### (autoloads (latin1-display latin1-display) "latin1-disp" "international/latin1-disp.el"
-;;;;;;  (14842 44484))
+;;;;;;  (14842 10654))
 ;;; Generated autoloads from international/latin1-disp.el
 
 (defvar latin1-display nil "\
@@ -9815,7 +9815,7 @@ Unconditionally turn on Lazy Lock mode." nil nil)
 ;;;***
 
 ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el"
-;;;;;;  (14821 39605))
+;;;;;;  (14819 42852))
 ;;; Generated autoloads from ledit.el
 
 (defconst ledit-save-files t "\
@@ -9882,7 +9882,7 @@ shown; this is often useful to constrain a big search." t nil)
 
 ;;;***
 
-;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (14840 12750))
+;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (14837 50473))
 ;;; Generated autoloads from log-edit.el
 
 (autoload (quote log-edit) "log-edit" "\
@@ -10146,8 +10146,8 @@ This function normally would be called when the message is sent." nil nil)
 
 ;;;### (autoloads (mail-fetch-field mail-unquote-printable-region
 ;;;;;;  mail-unquote-printable mail-quote-printable mail-file-babyl-p
-;;;;;;  mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (14801
-;;;;;;  58291))
+;;;;;;  mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (14800
+;;;;;;  33445))
 ;;; Generated autoloads from mail/mail-utils.el
 
 (defvar mail-use-rfc822 nil "\
@@ -10327,7 +10327,7 @@ Previous contents of that buffer are killed first." t nil)
 
 ;;;***
 
-;;;### (autoloads (man-follow man) "man" "man.el" (14829 51485))
+;;;### (autoloads (man-follow man) "man" "man.el" (14825 31072))
 ;;; Generated autoloads from man.el
 
 (defalias (quote manual-entry) (quote man))
@@ -10737,7 +10737,7 @@ followed by the first character of the construct.
 ;;;***
 
 ;;;### (autoloads (unmorse-region morse-region) "morse" "play/morse.el"
-;;;;;;  (14821 39609))
+;;;;;;  (14816 63829))
 ;;; Generated autoloads from play/morse.el
 
 (autoload (quote morse-region) "morse" "\
@@ -11046,7 +11046,7 @@ language environment LANG-ENV." nil nil)
 ;;;***
 
 ;;;### (autoloads (mwheel-install mouse-wheel-mode) "mwheel" "mwheel.el"
-;;;;;;  (14840 12750))
+;;;;;;  (14838 50497))
 ;;; Generated autoloads from mwheel.el
 
 (defvar mouse-wheel-mode nil "\
@@ -11071,7 +11071,7 @@ Enable mouse wheel support." nil nil)
 ;;;### (autoloads (network-connection network-connection-to-service
 ;;;;;;  whois-reverse-lookup whois finger ftp dig nslookup nslookup-host
 ;;;;;;  route arp netstat ipconfig ping traceroute) "net-utils" "net/net-utils.el"
-;;;;;;  (14813 54523))
+;;;;;;  (14813 44131))
 ;;; Generated autoloads from net/net-utils.el
 
 (autoload (quote traceroute) "net-utils" "\
@@ -11130,7 +11130,7 @@ Open a network connection to HOST on PORT." t nil)
 ;;;;;;  uncomment-region comment-kill comment-set-column comment-indent
 ;;;;;;  comment-indent-default comment-multi-line comment-padding
 ;;;;;;  comment-style comment-column) "newcomment" "newcomment.el"
-;;;;;;  (14821 39606))
+;;;;;;  (14816 63828))
 ;;; Generated autoloads from newcomment.el
 
 (defalias (quote indent-for-comment) (quote comment-indent))
@@ -11262,7 +11262,7 @@ symbol in the alist." nil nil)
 ;;;***
 
 ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el"
-;;;;;;  (14813 54522))
+;;;;;;  (14813 6105))
 ;;; Generated autoloads from gnus/nnfolder.el
 
 (autoload (quote nnfolder-generate-active-file) "nnfolder" "\
@@ -11471,7 +11471,7 @@ including a reproducible test case and send the message." t nil)
 ;;;***
 
 ;;;### (autoloads (edit-options list-options) "options" "options.el"
-;;;;;;  (14821 39606))
+;;;;;;  (14816 63828))
 ;;; Generated autoloads from options.el
 
 (autoload (quote list-options) "options" "\
@@ -11786,8 +11786,8 @@ Completion for the `chgrp' command." nil nil)
 
 ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list
 ;;;;;;  pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete
-;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (14829
-;;;;;;  51486))
+;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (14826
+;;;;;;  56519))
 ;;; Generated autoloads from pcomplete.el
 
 (autoload (quote pcomplete) "pcomplete" "\
@@ -11828,7 +11828,7 @@ Setup shell-mode to use pcomplete." nil nil)
 
 ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status
 ;;;;;;  cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs"
-;;;;;;  "pcvs.el" (14829 51486))
+;;;;;;  "pcvs.el" (14825 31072))
 ;;; Generated autoloads from pcvs.el
 
 (autoload (quote cvs-checkout) "pcvs" "\
@@ -12227,7 +12227,7 @@ This checks if all multi-byte characters in the region are printable or not." ni
 ;;;;;;  ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer
 ;;;;;;  ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces
 ;;;;;;  ps-print-buffer ps-print-customize ps-paper-type) "ps-print"
-;;;;;;  "ps-print.el" (14841 53026))
+;;;;;;  "ps-print.el" (14840 15865))
 ;;; Generated autoloads from ps-print.el
 
 (defvar ps-paper-type (quote letter) "\
@@ -12645,7 +12645,7 @@ Call up the RE Builder for the current window." t nil)
 
 ;;;### (autoloads (recentf-mode recentf-open-more-files recentf-open-files
 ;;;;;;  recentf-cleanup recentf-edit-list recentf-save-list) "recentf"
-;;;;;;  "recentf.el" (14840 12751))
+;;;;;;  "recentf.el" (14838 50964))
 ;;; Generated autoloads from recentf.el
 
 (autoload (quote recentf-save-list) "recentf" "\
@@ -12895,7 +12895,7 @@ Here are all local bindings.
 ;;;***
 
 ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el"
-;;;;;;  (14821 39607))
+;;;;;;  (14816 63829))
 ;;; Generated autoloads from emacs-lisp/regexp-opt.el
 
 (autoload (quote regexp-opt) "regexp-opt" "\
@@ -13581,7 +13581,7 @@ scribe-electric-parenthesis
 ;;;;;;  mail-signature mail-personal-alias-file mail-alias-file mail-default-reply-to
 ;;;;;;  mail-archive-file-name mail-header-separator mail-yank-ignored-headers
 ;;;;;;  mail-interactive mail-self-blind mail-specify-envelope-from
-;;;;;;  mail-from-style) "sendmail" "mail/sendmail.el" (14821 39609))
+;;;;;;  mail-from-style) "sendmail" "mail/sendmail.el" (14816 63829))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style (quote angles) "\
@@ -13818,7 +13818,7 @@ To work around that, do:
 ;;;***
 
 ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el"
-;;;;;;  (14837 23161))
+;;;;;;  (14834 5677))
 ;;; Generated autoloads from progmodes/sh-script.el
 
 (put (quote sh-mode) (quote mode-class) (quote special))
@@ -13927,7 +13927,7 @@ buffer called `*Shadows*'.  Shadowings are located by calling the
 ;;;***
 
 ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el"
-;;;;;;  (14841 53026))
+;;;;;;  (14841 19790))
 ;;; Generated autoloads from shell.el
 
 (defvar shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" "\
@@ -14513,8 +14513,8 @@ Check spelling of string supplied as argument." t nil)
 
 ;;;***
 
-;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (14821
-;;;;;;  39609))
+;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (14816
+;;;;;;  63829))
 ;;; Generated autoloads from play/spook.el
 
 (autoload (quote spook) "spook" "\
@@ -14875,7 +14875,7 @@ Read a complex stroke and insert its glyph into the current buffer." t nil)
 ;;;***
 
 ;;;### (autoloads (studlify-word studlify-region) "studly" "play/studly.el"
-;;;;;;  (14821 39609))
+;;;;;;  (14816 63829))
 ;;; Generated autoloads from play/studly.el
 
 (autoload (quote studlify-region) "studly" "\
@@ -15121,7 +15121,7 @@ tetris-mode keybindings:
 ;;;;;;  tex-start-options-string slitex-run-command latex-run-command
 ;;;;;;  tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp
 ;;;;;;  tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el"
-;;;;;;  (14829 51491))
+;;;;;;  (14825 31079))
 ;;; Generated autoloads from textmodes/tex-mode.el
 
 (defvar tex-shell-file-name nil "\
@@ -15403,7 +15403,7 @@ if large.  You can use Info-split to do this manually." t nil)
 ;;;***
 
 ;;;### (autoloads (texinfo-mode) "texinfo" "textmodes/texinfo.el"
-;;;;;;  (14821 39611))
+;;;;;;  (14819 42855))
 ;;; Generated autoloads from textmodes/texinfo.el
 
 (autoload (quote texinfo-mode) "texinfo" "\
@@ -15708,7 +15708,7 @@ If DATE is malformed, a zero time will be returned." nil nil)
 ;;;***
 
 ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp"
-;;;;;;  "time-stamp.el" (14840 12751))
+;;;;;;  "time-stamp.el" (14838 53329))
 ;;; Generated autoloads from time-stamp.el
 
 (autoload (quote time-stamp) "time-stamp" "\
@@ -15738,7 +15738,7 @@ With arg, turn time stamping on if and only if arg is positive." t nil)
 ;;;;;;  timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out
 ;;;;;;  timeclock-change timeclock-status-string timeclock-out timeclock-in
 ;;;;;;  timeclock-modeline-display) "timeclock" "calendar/timeclock.el"
-;;;;;;  (14844 3059))
+;;;;;;  (14823 8292))
 ;;; Generated autoloads from calendar/timeclock.el
 
 (autoload (quote timeclock-modeline-display) "timeclock" "\
@@ -15876,7 +15876,7 @@ be detected." nil (quote macro))
 ;;;***
 
 ;;;### (autoloads (batch-titdic-convert titdic-convert) "titdic-cnv"
-;;;;;;  "international/titdic-cnv.el" (14821 39608))
+;;;;;;  "international/titdic-cnv.el" (14816 17181))
 ;;; Generated autoloads from international/titdic-cnv.el
 
 (autoload (quote titdic-convert) "titdic-cnv" "\
@@ -16006,7 +16006,7 @@ function." nil nil)
 ;;;***
 
 ;;;### (autoloads (tooltip-mode tooltip-mode) "tooltip" "tooltip.el"
-;;;;;;  (14824 37433))
+;;;;;;  (14822 58259))
 ;;; Generated autoloads from tooltip.el
 
 (autoload (quote tooltip-mode) "tooltip" "\
@@ -16373,7 +16373,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." t nil)
 ;;;;;;  vc-create-snapshot vc-directory vc-resolve-conflicts vc-merge
 ;;;;;;  vc-insert-headers vc-version-other-window vc-diff vc-register
 ;;;;;;  vc-next-action edit-vc-file with-vc-file vc-before-checkin-hook
-;;;;;;  vc-checkin-hook) "vc" "vc.el" (14841 53027))
+;;;;;;  vc-checkin-hook) "vc" "vc.el" (14841 30887))
 ;;; Generated autoloads from vc.el
 
 (defvar vc-checkin-hook nil "\
@@ -16556,7 +16556,7 @@ colors. `vc-annotate-background' specifies the background color." t nil)
 ;;;***
 
 ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el"
-;;;;;;  (14811 29945))
+;;;;;;  (14810 32085))
 ;;; Generated autoloads from vc-rcs.el
 
 (defvar vc-rcs-master-templates (quote ("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\
@@ -17140,7 +17140,7 @@ Turn on VIP emulation of VI." t nil)
 ;;;***
 
 ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el"
-;;;;;;  (14844 3059))
+;;;;;;  (14651 36650))
 ;;; Generated autoloads from emulation/viper.el
 
 (autoload (quote toggle-viper-mode) "viper" "\
@@ -17167,7 +17167,7 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
 ;;;***
 
 ;;;### (autoloads (which-func-mode which-func-mode-global) "which-func"
-;;;;;;  "which-func.el" (14813 54519))
+;;;;;;  "which-func.el" (14813 6100))
 ;;; Generated autoloads from which-func.el
 
 (defvar which-func-mode-global nil "\
@@ -17193,7 +17193,7 @@ and off otherwise." t nil)
 
 ;;;### (autoloads (whitespace-describe whitespace-global-mode whitespace-cleanup-region
 ;;;;;;  whitespace-cleanup whitespace-region whitespace-buffer) "whitespace"
-;;;;;;  "whitespace.el" (14829 51486))
+;;;;;;  "whitespace.el" (14826 56520))
 ;;; Generated autoloads from whitespace.el
 
 (autoload (quote whitespace-buffer) "whitespace" "\
@@ -17288,7 +17288,7 @@ whitespaces during the process of your editing)." t nil)
 ;;;***
 
 ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse
-;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (14840 12751))
+;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (14840 890))
 ;;; Generated autoloads from wid-browse.el
 
 (autoload (quote widget-browse-at) "wid-browse" "\
@@ -17307,7 +17307,7 @@ With arg, turn widget mode on if and only if arg is positive." t nil)
 ;;;***
 
 ;;;### (autoloads (widget-delete widget-create widget-prompt-value)
-;;;;;;  "wid-edit" "wid-edit.el" (14841 53027))
+;;;;;;  "wid-edit" "wid-edit.el" (14841 19791))
 ;;; Generated autoloads from wid-edit.el
 
 (autoload (quote widget-prompt-value) "wid-edit" "\
@@ -17385,7 +17385,7 @@ With arg, turn Winner mode on if and only if arg is positive." t nil)
 ;;;***
 
 ;;;### (autoloads (woman-find-file woman-dired-find-file woman) "woman"
-;;;;;;  "woman.el" (14837 23158))
+;;;;;;  "woman.el" (14836 3751))
 ;;; Generated autoloads from woman.el
 
 (autoload (quote woman) "woman" "\
@@ -17539,7 +17539,7 @@ Turn it on to use emacs mouse commands, and off to use xterm mouse commands." t
 ;;;***
 
 ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism
-;;;;;;  yow) "yow" "play/yow.el" (14811 29947))
+;;;;;;  yow) "yow" "play/yow.el" (14809 51714))
 ;;; Generated autoloads from play/yow.el
 
 (autoload (quote yow) "yow" "\
@@ -17557,7 +17557,7 @@ Zippy goes to the analyst." t nil)
 
 ;;;***
 
-;;;### (autoloads (zone) "zone" "play/zone.el" (14821 39609))
+;;;### (autoloads (zone) "zone" "play/zone.el" (14818 62648))
 ;;; Generated autoloads from play/zone.el
 
 (autoload (quote zone) "zone" "\
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 62fe6f11c24..b34ddfe0b60 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -544,9 +544,9 @@ Optionally use FORMAT."
 	 ((eq cur-char ?y)		;year
 	  (or alt-form (not (string-equal field-width ""))
 	      (time-stamp-conv-warn "%y" "%:y"))
-          (format-time-string "%Y" time))
+	  (string-to-int (format-time-string "%Y" time)))
 	 ((eq cur-char ?Y)		;4-digit year, new style
-          (format-time-string "%Y" time))
+	  (string-to-int (format-time-string "%Y" time)))
 	 ((eq cur-char ?z)		;time zone lower case
 	  (if change-case
 	      ""			;discourage %z variations