*** empty log message ***

1 files changed, 15 insertions, 11 deletions

diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index a36d903bc15..035d70a9f60 100644
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -19,7 +19,7 @@
 (put 'mail-hist 'custom-loads '("mail-hist"))
 (put 'gnus-article-emphasis 'custom-loads '("gnus-art"))
 (put 'dunnet 'custom-loads '("dunnet"))
-(put 'fortran 'custom-loads '("f90" "fortran"))
+(put 'fortran 'custom-loads '("fortran"))
 (put 'feedmail-header 'custom-loads '("feedmail"))
 (put 'reftex-table-of-contents-browser 'custom-loads '("reftex-vars"))
 (put 'mspools 'custom-loads '("mspools"))
@@ -115,7 +115,7 @@
 (put 'iso-acc 'custom-loads '("iso-acc"))
 (put 'gnus-summary-pick 'custom-loads '("gnus-salt"))
 (put 'gnus-thread 'custom-loads '("gnus-sum"))
-(put 'languages 'custom-loads '("cus-edit" "info-look" "ada-mode" "antlr-mode" "asm-mode" "cperl-mode" "dcl-mode" "delphi" "fortran" "hideshow" "icon" "idlwave" "m4-mode" "meta-mode" "modula2" "octave-mod" "pascal" "perl-mode" "prolog" "ps-mode" "sh-script" "simula" "tcl" "vhdl-mode" "sgml-mode"))
+(put 'languages 'custom-loads '("cus-edit" "info-look" "ada-mode" "antlr-mode" "asm-mode" "cperl-mode" "dcl-mode" "delphi" "f90" "fortran" "hideshow" "icon" "idlwave" "m4-mode" "meta-mode" "modula2" "octave-mod" "pascal" "perl-mode" "prolog" "ps-mode" "sh-script" "simula" "tcl" "vhdl-mode" "sgml-mode"))
 (put 'reftex-miscellaneous-configurations 'custom-loads '("reftex-vars"))
 (put 'pong 'custom-loads '("pong"))
 (put 'ediff-ptch 'custom-loads '("ediff-ptch"))
@@ -126,7 +126,7 @@
 (put 'gnus-treading 'custom-loads '("gnus-sum"))
 (put 'idlwave-external-programs 'custom-loads '("idlwave"))
 (put 'strokes 'custom-loads '("strokes"))
-(put 'mouse 'custom-loads '("faces" "mouse" "menu-bar" "avoid" "goto-addr" "mouse-sel" "msb" "mwheel" "strokes" "tooltip"))
+(put 'mouse 'custom-loads '("faces" "mouse" "menu-bar" "avoid" "mouse-sel" "msb" "mwheel" "strokes" "tooltip" "goto-addr"))
 (put 'nnmail-various 'custom-loads '("nnmail"))
 (put 'extensions 'custom-loads '("generic" "iswitchb" "time-stamp" "wid-edit" "cust-print" "eldoc" "page-ext"))
 (put 'ebnf-displacement 'custom-loads '("ebnf2ps"))
@@ -267,7 +267,7 @@
 (put 'ebnf-optimization 'custom-loads '("ebnf2ps"))
 (put 'apropos 'custom-loads '("apropos"))
 (put 'gomoku 'custom-loads '("gomoku"))
-(put 'tools 'custom-loads '("add-log" "calculator" "compare-w" "diff-mode" "diff" "ediff" "elide-head" "emerge" "gud" "pcvs-defs" "rcompile" "smerge-mode" "speedbar" "tempo" "tooltip" "vc" "which-func" "copyright" "compile" "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" "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"))
@@ -284,7 +284,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" "rlogin" "shell" "term" "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"))
 (put 'vhdl-highlight-faces 'custom-loads '("vhdl-mode"))
@@ -307,7 +307,7 @@
 (put 'vhdl-port 'custom-loads '("vhdl-mode"))
 (put 'calculator 'custom-loads '("calculator"))
 (put 'custom-menu 'custom-loads '("cus-edit"))
-(put 'comm 'custom-loads '("net-utils" "eudc-vars" "ldap"))
+(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"))
@@ -329,7 +329,7 @@
 (put 'abbrev-mode 'custom-loads '("abbrev" "cus-edit" "mailabbrev"))
 (put 'earcon 'custom-loads '("earcon"))
 (put 'feedmail-headers 'custom-loads '("feedmail"))
-(put 'hypermedia 'custom-loads '("browse-url" "goto-addr" "wid-edit" "metamail"))
+(put 'hypermedia 'custom-loads '("wid-edit" "metamail" "browse-url" "goto-addr"))
 (put 'ff 'custom-loads '("find-file"))
 (put 'prolog 'custom-loads '("prolog"))
 (put 'follow 'custom-loads '("follow"))
@@ -349,7 +349,7 @@
 (put 'change-log 'custom-loads '("add-log"))
 (put 'gnus-group-levels 'custom-loads '("gnus-group" "gnus-start" "gnus"))
 (put 'cperl 'custom-loads '("cperl-mode"))
-(put 'files 'custom-loads '("files" "ange-ftp" "autoinsert" "autorevert" "cus-edit" "filecache" "recentf" "shadow"))
+(put 'files 'custom-loads '("files" "autoinsert" "autorevert" "cus-edit" "filecache" "recentf" "shadow" "ange-ftp"))
 (put 'pcl-cvs 'custom-loads '("cvs-status" "log-edit" "log-view" "pcvs-defs" "pcvs-info" "pcvs-parse" "pcvs"))
 (put 'rmail-files 'custom-loads '("rmail"))
 (put 'gnus-summary-format 'custom-loads '("gnus-sum" "gnus"))
@@ -440,7 +440,7 @@
 (put 'reftex-index-support 'custom-loads '("reftex-vars"))
 (put 'pascal 'custom-loads '("pascal"))
 (put 'rmail-retrieve 'custom-loads '("rmail"))
-(put 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" "saveplace" "snmp-mode" "sort" "tar-mode" "time-stamp"))
+(put 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" "saveplace" "sort" "tar-mode" "time-stamp" "snmp-mode"))
 (put 'mail 'custom-loads '("simple" "startup" "time" "gnus" "message" "emacsbug" "feedmail" "mail-extr" "mail-hist" "mail-utils" "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"))
@@ -509,7 +509,7 @@
 (put 'tempo 'custom-loads '("tempo"))
 (put 'c 'custom-loads '("tooltip" "cc-vars" "cmacexp" "hideif"))
 (put 'nnmail-prepare 'custom-loads '("nnmail"))
-(put 'processes 'custom-loads '("comint" "cus-edit" "rcompile" "rlogin" "shell" "term" "metamail" "compile" "executable" "sql" "flyspell"))
+(put 'processes 'custom-loads '("comint" "cus-edit" "shell" "term" "metamail" "compile" "executable" "sql" "flyspell" "rcompile" "rlogin"))
 (put 'ebnf2ps 'custom-loads '("ebnf2ps"))
 (put 'sendmail 'custom-loads '("sendmail"))
 (put 'gnus-article-signature 'custom-loads '("gnus-art"))
@@ -647,6 +647,8 @@
 (custom-put-if-not 'which-func 'group-documentation "Mode to display the current function name in the modeline.")
 (custom-put-if-not 'read-mail-command 'custom-version "21.1")
 (custom-put-if-not 'read-mail-command 'standard-value t)
+(custom-put-if-not 'ange-ftp-try-passive-mode 'custom-version 21.1)
+(custom-put-if-not 'ange-ftp-try-passive-mode 'standard-value t)
 (custom-put-if-not 'mouse-buffer-menu-mode-mult 'custom-version "20.3")
 (custom-put-if-not 'mouse-buffer-menu-mode-mult 'standard-value t)
 (custom-put-if-not 'eval-expression-print-length 'custom-version "21.1")
@@ -675,6 +677,8 @@
 (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")
+(custom-put-if-not 'focus-follows-mouse 'standard-value t)
 (custom-put-if-not 'fortran-comment-line-start-skip 'custom-version "21.1")
 (custom-put-if-not 'fortran-comment-line-start-skip 'standard-value t)
 (custom-put-if-not 'checkdoc 'custom-version "20.3")
@@ -740,7 +744,7 @@
 (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") ("20.4" "sh-script" "help" "compile") ("21.1" "debug" "paths" "sgml-mode" "fortran" "etags" "cus-edit" "add-log" "find-func" "simple") ("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "uce" "mouse" "diary-lib" "sendmail" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help" "browse-url" "add-log" "find-func" "vc-hooks" "cus-edit" "replace"))
+(defvar custom-versions-load-alist '(("20.3.3" "dos-vars") (21.1 "ange-ftp") ("20.4" "sh-script" "help" "compile") ("21.1" "debug" "paths" "sgml-mode" "fortran" "etags" "cus-edit" "add-log" "find-func" "simple") ("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" "vc-hooks" "cus-edit" "replace"))
  "For internal use by custom.")
 
 (provide 'cus-load)