1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index 64bf8286083..0278300b92d 100644
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -74,8 +74,8 @@
 (put 'gnus-start 'custom-loads '("gnus-group" "gnus-int" "gnus-start" "gnus-util" "gnus"))
 (put 'dcl 'custom-loads '("dcl-mode"))
 (put 'cursor 'custom-loads '("frame"))
-(put 'ogonek 'custom-loads '("ogonek"))
 (put 'gnus-extract-view 'custom-loads '("gnus-sum" "gnus-uu"))
+(put 'ogonek 'custom-loads '("ogonek"))
 (put 'dired-keys 'custom-loads '("dired-x"))
 (put 'lisp-mnt 'custom-loads '("lisp-mnt"))
 (put 'ediff-mult 'custom-loads '("ediff-mult"))
@@ -491,7 +491,7 @@
 (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 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" "saveplace" "sort" "tar-mode" "time-stamp" "snmp-mode" "timeclock"))
 (put 'mail 'custom-loads '("simple" "startup" "time" "eudc-vars" "gnus" "mail-utils" "mm-decode" "message" "imap" "starttls" "emacsbug" "feedmail" "mail-extr" "mail-hist" "mailalias" "metamail" "mh-e" "mspools" "rmail" "sendmail" "smtpmail" "supercite" "uce" "fortune"))
 (put 'paren-blinking 'custom-loads '("simple"))
 (put 'gnus-summary-sort 'custom-loads '("gnus-sum"))
@@ -532,7 +532,7 @@
 (put 'ebnf-special 'custom-loads '("ebnf2ps"))
 (put 'gnus-article-highlight 'custom-loads '("gnus-art"))
 (put 'tooltip 'custom-loads '("tooltip"))
-(put 'gud 'custom-loads '("gud"))
+(put 'gud 'custom-loads '("gud" "tooltip"))
 (put 'c-macro 'custom-loads '("cmacexp"))
 (put 'gnus-cache 'custom-loads '("gnus-cache" "gnus"))
 (put 'eshell-module 'custom-loads '("esh-groups" "esh-module"))
@@ -567,7 +567,7 @@
 (put 'glasses 'custom-loads '("glasses"))
 (put 'vhdl-style 'custom-loads '("vhdl-mode"))
 (put 'tempo 'custom-loads '("tempo"))
-(put 'c 'custom-loads '("tooltip" "cc-vars" "cmacexp" "cpp" "hideif"))
+(put 'c 'custom-loads '("cc-vars" "cmacexp" "cpp" "hideif"))
 (put 'nnmail-prepare 'custom-loads '("nnmail"))
 (put 'processes 'custom-loads '("ansi-color" "comint" "cus-edit" "executable" "pcomplete" "shell" "term" "rcompile" "rlogin" "metamail" "compile" "sql" "flyspell"))
 (put 'ebnf2ps 'custom-loads '("ebnf2ps"))
@@ -711,6 +711,8 @@ the tasks accomplished by such tools.")
 (custom-put-if-not 'change-log-email-face 'group-documentation nil)
 (custom-put-if-not 'mouse 'custom-version "21.1")
 (custom-put-if-not 'mouse 'group-documentation "Input from the mouse.")
+(custom-put-if-not 'browse-url-kde-program 'custom-version "21.1")
+(custom-put-if-not 'browse-url-kde-program 'standard-value t)
 (custom-put-if-not 'snmp 'custom-version "20.4")
 (custom-put-if-not 'snmp 'group-documentation "Mode for editing SNMP MIB files.")
 (custom-put-if-not 'widget-image-enable 'custom-version "21.1")
@@ -980,6 +982,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'nnmail-scan-directory-mail-source-once 'standard-value t)
 (custom-put-if-not 'gnus-preserve-marks 'custom-version "21.1")
 (custom-put-if-not 'gnus-preserve-marks 'standard-value t)
+(custom-put-if-not 'mail-envelope-from 'custom-version "21.1")
+(custom-put-if-not 'mail-envelope-from 'standard-value t)
 (custom-put-if-not 'hs-minor-mode-hook 'custom-version "21.1")
 (custom-put-if-not 'hs-minor-mode-hook 'standard-value t)
 (custom-put-if-not 'speedbar-indentation-width 'custom-version "21.1")
@@ -1113,7 +1117,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" "rmailedit" "dabbrev" "isearch" "gnus-start" "mule" "hideshow" "paths" "sgml-mode" "net-utils" "cperl-mode" "rmail" "font-lock" "gnus-nocem" "vc-hooks" "paren" "faces" "fortran" "vc" "etags" "cus-edit" "frame" "vc-sccs" "gnus-group" "gnus-sum" "smtpmail" "add-log" "find-func" "wid-edit" "vc-rcs" "files" "nnmail" "message" "ps-print" "vc-cvs" "simple" "gnus-agent" "flyspell" "gnus-art" "browse-url" "speedbar") ("20.8" "sql"))
+(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" "rmailedit" "dabbrev" "isearch" "gnus-start" "mule" "hideshow" "sendmail" "paths" "sgml-mode" "net-utils" "cperl-mode" "rmail" "font-lock" "gnus-nocem" "vc-hooks" "paren" "faces" "fortran" "vc" "etags" "cus-edit" "frame" "vc-sccs" "gnus-group" "gnus-sum" "smtpmail" "add-log" "find-func" "wid-edit" "vc-rcs" "files" "nnmail" "message" "ps-print" "vc-cvs" "simple" "gnus-agent" "flyspell" "gnus-art" "browse-url" "speedbar") ("20.8" "sql"))
  "For internal use by custom.")
 
 (provide 'cus-load)