Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

lisp/ChangeLog, and src/ChangeLog for list of changes.

5 files changed, 484 insertions, 411 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92399745975..17f3060d944 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-26  Andrew Choi  <akochoi@shaw.ca>
+
+	* term/mac-win.el: Don't call ediff-toggle-multiframe.  Set
+	default directory.  Set process-connection-type to nil.
+
 2002-04-26  Richard M. Stallman  <rms@gnu.org>
 
 	* cus-edit.el (customize-face): Use read-face-name
diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index b386b57a8c1..6d7a97c3afd 100644
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -36,9 +36,9 @@
 (put 'woman-faces 'custom-loads '("woman"))
 (put 'ps-print-vertical 'custom-loads '("ps-print"))
 (put 'supercite-hooks 'custom-loads '("supercite"))
-(put 'chinese-calendar 'custom-loads '("cal-china"))
 (put 'vhdl-menu 'custom-loads '("vhdl-mode"))
 (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"))
@@ -62,7 +62,7 @@
 (put 'dirtrack 'custom-loads '("dirtrack"))
 (put 'ediff-window 'custom-loads '("ediff-help" "ediff-wind"))
 (put 'bruce 'custom-loads '("bruce"))
-(put 'windows 'custom-loads '("scroll-all" "window" "follow" "windmove"))
+(put 'windows 'custom-loads '("hscroll" "scroll-all" "window" "follow" "windmove"))
 (put 'gnus-exit 'custom-loads '("gnus-group" "gnus"))
 (put 'speedbar 'custom-loads '("speedbar"))
 (put 'etags 'custom-loads '("etags"))
@@ -112,7 +112,7 @@
 (put 'mh-hook 'custom-loads '("mh-e"))
 (put 'yow 'custom-loads '("yow"))
 (put 'reftex-defining-label-environments 'custom-loads '("reftex-vars"))
-(put 'asm 'custom-loads '("asm-mode" "cc-vars"))
+(put 'asm 'custom-loads '("asm-mode"))
 (put 'gnus-score-files 'custom-loads '("gnus-score" "gnus"))
 (put 'mail-abbrev 'custom-loads '("mailabbrev"))
 (put 'feedmail 'custom-loads '("feedmail"))
@@ -130,7 +130,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" "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" "xml-lite"))
+(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"))
@@ -145,8 +145,8 @@
 (put 'smiley 'custom-loads '("smiley-ems"))
 (put 'extensions 'custom-loads '("generic" "time-stamp" "wid-edit" "cust-print" "eldoc" "page-ext"))
 (put 'tetris 'custom-loads '("tetris"))
-(put 'appt 'custom-loads '("appt"))
 (put 'ebnf-displacement 'custom-loads '("ebnf2ps"))
+(put 'appt 'custom-loads '("appt"))
 (put 'snmp 'custom-loads '("snmp-mode"))
 (put 'speedbar-faces 'custom-loads '("speedbar" "vhdl-mode"))
 (put 'rmail 'custom-loads '("paths" "rmail" "undigest"))
@@ -219,8 +219,8 @@
 (put 'auto-save 'custom-loads '("files" "startup"))
 (put 'tpu 'custom-loads '("tpu-edt" "tpu-extras"))
 (put 'w32 'custom-loads '("w32-vars"))
-(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"))
@@ -246,7 +246,6 @@
 (put 'cperl-indentation-details 'custom-loads '("cperl-mode"))
 (put 'mail-extr 'custom-loads '("mail-extr"))
 (put 'double 'custom-loads '("double"))
-(put 'xml-lite 'custom-loads '("xml-lite"))
 (put 'imenu 'custom-loads '("imenu"))
 (put 'eshell-var 'custom-loads '("esh-var"))
 (put 'scribe 'custom-loads '("scribe"))
@@ -275,10 +274,10 @@
 (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"))
+(put 'diary 'custom-loads '("calendar" "diary-lib" "solar"))
 (put 'custom-magic-faces 'custom-loads '("cus-edit"))
 (put 'emacsbug 'custom-loads '("emacsbug"))
 (put 'mh-compose 'custom-loads '("mh-comp"))
@@ -302,7 +301,7 @@
 (put 'apropos 'custom-loads '("apropos"))
 (put 'gomoku 'custom-loads '("gomoku"))
 (put 'eshell-pred 'custom-loads '("em-pred"))
-(put 'tools 'custom-loads '("add-log" "calculator" "compare-w" "diff-mode" "diff" "ediff" "elide-head" "emerge" "gud" "pcvs-defs" "smerge-mode" "speedbar" "tempo" "tooltip" "vc" "which-func" "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" "rcompile" "compile" "ebrowse" "etags" "glasses" "make-mode"))
 (put 'gnus-topic 'custom-loads '("gnus-topic"))
 (put 'sgml 'custom-loads '("sgml-mode"))
 (put 'keyboard 'custom-loads '("mule" "chistory" "type-break"))
@@ -365,15 +364,15 @@
 (put 'nnmail-retrieve 'custom-loads '("nnmail"))
 (put 'gnus-duplicate 'custom-loads '("gnus-dup"))
 (put 'find-function 'custom-loads '("find-func"))
-(put 'menu 'custom-loads '("faces" "tmm" "easymenu"))
+(put 'menu 'custom-loads '("faces" "menu-bar" "tmm" "easymenu"))
 (put 'eshell-test 'custom-loads '("esh-test"))
 (put 'vhdl-highlight 'custom-loads '("vhdl-mode"))
 (put 'widgets 'custom-loads '("wid-browse" "wid-edit"))
 (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"))
@@ -498,7 +497,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" "snmp-mode" "timeclock"))
+(put 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" "saveplace" "sort" "tar-mode" "time-stamp" "timeclock" "snmp-mode"))
 (put 'mail 'custom-loads '("simple" "startup" "time" "gnus" "mail-utils" "mm-decode" "message" "imap" "starttls" "emacsbug" "feedmail" "mail-extr" "mail-hist" "mailalias" "metamail" "mh-e" "mspools" "rmail" "sendmail" "smtpmail" "supercite" "uce" "eudc-vars" "fortune"))
 (put 'paren-blinking 'custom-loads '("simple"))
 (put 'gnus-summary-sort 'custom-loads '("gnus-sum"))
@@ -691,7 +690,7 @@
 (custom-put-if-not 'change-log-conditionals-face 'group-documentation nil)
 (custom-put-if-not 'mail-source 'custom-version "21.1")
 (custom-put-if-not 'mail-source 'group-documentation "The mail-fetching library.")
-(custom-put-if-not 'smtpmail-auth-credentials 'custom-version "21.1")
+(custom-put-if-not 'smtpmail-auth-credentials 'custom-version "21.3")
 (custom-put-if-not 'smtpmail-auth-credentials 'standard-value t)
 (custom-put-if-not 'minibuffer-prompt 'custom-version "21.3")
 (custom-put-if-not 'minibuffer-prompt 'group-documentation nil)
@@ -777,6 +776,8 @@ the tasks accomplished by such tools.")
 (custom-put-if-not 'tildify 'group-documentation "Adding missing hard spaces or other text fragments into texts.")
 (custom-put-if-not 'normal-erase-is-backspace 'custom-version "21.1")
 (custom-put-if-not 'normal-erase-is-backspace 'standard-value t)
+(custom-put-if-not 'vc-cvs-global-switches 'custom-version "21.3")
+(custom-put-if-not 'vc-cvs-global-switches 'standard-value t)
 (custom-put-if-not 'gnus-article-banner-alist 'custom-version "21.1")
 (custom-put-if-not 'gnus-article-banner-alist 'standard-value t)
 (custom-put-if-not 'region 'custom-version "21.1")
@@ -840,6 +841,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'message-buffer-naming-style 'standard-value t)
 (custom-put-if-not 'ps-footer-font-size 'custom-version "21.1")
 (custom-put-if-not 'ps-footer-font-size 'standard-value t)
+(custom-put-if-not 'hscroll-margin 'custom-version "21.3")
+(custom-put-if-not 'hscroll-margin 'standard-value t)
 (custom-put-if-not 'tags-apropos-additional-actions 'custom-version "21.1")
 (custom-put-if-not 'tags-apropos-additional-actions 'standard-value t)
 (custom-put-if-not 'generic-x 'custom-version "20.3")
@@ -858,6 +861,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (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 'diary-sabbath-candles-minutes 'custom-version "21.1")
+(custom-put-if-not 'diary-sabbath-candles-minutes 'standard-value t)
 (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")
@@ -946,6 +951,8 @@ 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 'dired-view-command-alist 'custom-version 21.4)
+(custom-put-if-not 'dired-view-command-alist 'standard-value t)
 (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")
@@ -988,6 +995,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'message-forward-ignored-headers 'standard-value t)
 (custom-put-if-not 'eudc 'custom-version "21.1")
 (custom-put-if-not 'eudc 'group-documentation "Emacs Unified Directory Client.")
+(custom-put-if-not 'yank-excluded-properties 'custom-version 21.4)
+(custom-put-if-not 'yank-excluded-properties 'standard-value t)
 (custom-put-if-not 'scrolling 'custom-version "21.1")
 (custom-put-if-not 'scrolling 'group-documentation "Scrolling windows.")
 (custom-put-if-not 'ps-paragraph-regexp 'custom-version "21.1")
@@ -1020,8 +1029,6 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'custom-comment-face 'group-documentation nil)
 (custom-put-if-not 'custom-raised-buttons 'custom-version "21.1")
 (custom-put-if-not 'custom-raised-buttons 'standard-value t)
-(custom-put-if-not 'gnus-article-x-face-command 'custom-version "21.1")
-(custom-put-if-not 'gnus-article-x-face-command 'standard-value t)
 (custom-put-if-not 'gnus-inhibit-user-auto-expire 'custom-version "21.1")
 (custom-put-if-not 'gnus-inhibit-user-auto-expire 'standard-value t)
 (custom-put-if-not 'show-paren-ring-bell-on-mismatch 'custom-version "20.3")
@@ -1034,6 +1041,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'gnus-emphasize-whitespace-regexp 'standard-value t)
 (custom-put-if-not 'gnus-summary-show-article-charset-alist 'custom-version "21.1")
 (custom-put-if-not 'gnus-summary-show-article-charset-alist 'standard-value t)
+(custom-put-if-not 'mail-use-dsn 'custom-version "21.3")
+(custom-put-if-not 'mail-use-dsn 'standard-value t)
 (custom-put-if-not 'xscheme-start-hook 'custom-version 20.3)
 (custom-put-if-not 'xscheme-start-hook 'standard-value t)
 (custom-put-if-not 'vc-dired-listing-switches 'custom-version "21.1")
@@ -1151,7 +1160,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 "xscheme") ("20.3.3" "dos-vars") (21.1 "ange-ftp") ("20.4" "files" "help" "sh-script" "compile") ("21.2" "add-log" "sgml-mode") ("21.3" "vc-cvs" "replace" "ange-ftp") (21.3 "ange-ftp") ("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "frame" "uce" "mouse" "diary-lib" "sendmail" "simple" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help-mode" "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" "vc-rcs" "fortran" "vc" "etags" "cus-edit" "vc-sccs" "gnus-group" "gnus-sum" "add-log" "find-func" "frame" "wid-edit" "smtpmail" "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 "xscheme") (21.4 "simple" "dired") ("20.3.3" "dos-vars") (21.1 "ange-ftp") ("20.4" "files" "help" "sh-script" "compile") ("21.2" "add-log" "sgml-mode") (21.3 "ange-ftp") ("21.3" "sendmail" "replace" "hscroll" "vc-cvs" "ange-ftp" "smtpmail") ("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "frame" "uce" "mouse" "diary-lib" "sendmail" "simple" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help-mode" "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" "vc-rcs" "fortran" "solar" "vc" "etags" "cus-edit" "vc-sccs" "gnus-group" "gnus-sum" "smtpmail" "add-log" "find-func" "frame" "wid-edit" "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)
diff --git a/lisp/finder-inf.el b/lisp/finder-inf.el
index 7172fea3c2f..ac6e7d55558 100644
--- a/lisp/finder-inf.el
+++ b/lisp/finder-inf.el
@@ -335,7 +335,7 @@
         "highlight the current line"
         (faces  frames  emulation))
     ("ibuf-ext.el"
-        "extensions for ibuffer"
+        "extensions for ibuffer "
         (buffer  convenience))
     ("ibuf-macs.el"
         "macros for ibuffer"
@@ -868,303 +868,6 @@
     ("calcsel2.el"
         "selection functions for Calc"
         nil)
-    ("binhex.el"
-        "elisp native binhex decode"
-        (binhex news))
-    ("earcon.el"
-        "sound effects for messages"
-        nil)
-    ("flow-fill.el"
-        "interprete RFC2646 \"flowed\" text"
-        (mail))
-    ("format-spec.el"
-        "functions for formatting arbitrary formatting strings"
-        (tools))
-    ("gnus-agent.el"
-        "unplugged support for Gnus"
-        nil)
-    ("gnus-art.el"
-        "article mode commands for Gnus"
-        (news))
-    ("gnus-async.el"
-        "asynchronous support for Gnus"
-        (news))
-    ("gnus-audio.el"
-        "sound effects for Gnus"
-        (news  mail  multimedia))
-    ("gnus-bcklg.el"
-        "backlog functions for Gnus"
-        (news))
-    ("gnus-cache.el"
-        "cache interface for Gnus"
-        (news))
-    ("gnus-cite.el"
-        "parse citations in articles for Gnus"
-        nil)
-    ("gnus-cus.el"
-        "customization commands for Gnus"
-        (news))
-    ("gnus-demon.el"
-        "daemonic Gnus behaviour"
-        (news))
-    ("gnus-draft.el"
-        "draft message support for Gnus"
-        (news))
-    ("gnus-dup.el"
-        "suppression of duplicate articles in Gnus"
-        (news))
-    ("gnus-eform.el"
-        "a mode for editing forms for Gnus"
-        (news))
-    ("gnus-ems.el"
-        "functions for making Gnus work under different Emacsen"
-        (news))
-    ("gnus-gl.el"
-        "an interface to GroupLens for Gnus"
-        (news  score))
-    ("gnus-group.el"
-        "group mode commands for Gnus"
-        (news))
-    ("gnus-int.el"
-        "backend interface functions for Gnus"
-        (news))
-    ("gnus-kill.el"
-        "kill commands for Gnus"
-        (news))
-    ("gnus-logic.el"
-        "advanced scoring code for Gnus"
-        (news))
-    ("gnus-mh.el"
-        "mh-e interface for Gnus"
-        (news))
-    ("gnus-ml.el"
-        "mailing list minor mode for Gnus"
-        (news))
-    ("gnus-mlspl.el"
-        "a group params-based mail splitting mechanism"
-        (news  mail))
-    ("gnus-move.el"
-        "commands for moving Gnus from one server to another"
-        (news))
-    ("gnus-msg.el"
-        "mail and post interface for Gnus"
-        (news))
-    ("gnus-mule.el"
-        "provide backward compatibility function to GNUS"
-        (news  i18n))
-    ("gnus-nocem.el"
-        "NoCeM pseudo-cancellation treatment"
-        (news))
-    ("gnus-range.el"
-        "range and sequence functions for Gnus"
-        (news))
-    ("gnus-salt.el"
-        "alternate summary mode interfaces for Gnus"
-        (news))
-    ("gnus-score.el"
-        "scoring code for Gnus"
-        (news))
-    ("gnus-setup.el"
-        "initialization & setup for Gnus 5"
-        (news))
-    ("gnus-soup.el"
-        "SOUP packet writing support for Gnus"
-        (news  mail))
-    ("gnus-spec.el"
-        "format spec functions for Gnus"
-        (news))
-    ("gnus-srvr.el"
-        "virtual server support for Gnus"
-        (news))
-    ("gnus-start.el"
-        "startup functions for Gnus"
-        (news))
-    ("gnus-sum.el"
-        "summary mode commands for Gnus"
-        (news))
-    ("gnus-topic.el"
-        "a folding minor mode for Gnus group buffers"
-        (news))
-    ("gnus-undo.el"
-        "minor mode for undoing in Gnus"
-        (news))
-    ("gnus-util.el"
-        "utility functions for Gnus"
-        (news))
-    ("gnus-uu.el"
-        "extract (uu)encoded files in Gnus"
-        nil)
-    ("gnus-vm.el"
-        "vm interface for Gnus"
-        (news  mail))
-    ("gnus-win.el"
-        "window configuration functions for Gnus"
-        (news))
-    ("gnus.el"
-        "a newsreader for GNU Emacs"
-        (news  mail))
-    ("ietf-drums.el"
-        "functions for parsing RFC822bis headers"
-        nil)
-    ("imap.el"
-        "imap library"
-        (mail))
-    ("mail-parse.el"
-        "interface functions for parsing mail"
-        nil)
-    ("mail-prsvr.el"
-        "interface variables for parsing mail"
-        nil)
-    ("mail-source.el"
-        "functions for fetching mail"
-        (news  mail))
-    ("mailcap.el"
-        "MIME media types configuration"
-        (news  mail  multimedia))
-    ("message.el"
-        "composing mail and news messages"
-        (mail  news))
-    ("messcompat.el"
-        "making message mode compatible with mail mode"
-        (mail  news))
-    ("mm-bodies.el"
-        "functions for decoding MIME things"
-        nil)
-    ("mm-decode.el"
-        "functions for decoding MIME things"
-        nil)
-    ("mm-encode.el"
-        "functions for encoding MIME things "
-        nil)
-    ("mm-partial.el"
-        "showing message/partial"
-        (message partial))
-    ("mm-util.el"
-        "Utility functions for Mule and low level things"
-        nil)
-    ("mm-uu.el"
-        "return uu stuff as mm handles"
-        (postscript uudecode binhex shar forward news))
-    ("mm-view.el"
-        "functions for viewing MIME objects"
-        nil)
-    ("mml.el"
-        "package for parsing and validating MML documents"
-        nil)
-    ("nnagent.el"
-        "offline backend for Gnus"
-        (news  mail))
-    ("nnbabyl.el"
-        "rmail mbox access for Gnus"
-        (news  mail))
-    ("nndir.el"
-        "single directory newsgroup access for Gnus"
-        (news))
-    ("nndoc.el"
-        "single file access for Gnus"
-        (news))
-    ("nndraft.el"
-        "draft article access for Gnus"
-        (news))
-    ("nneething.el"
-        "arbitrary file access for Gnus"
-        (news  mail))
-    ("nnfolder.el"
-        "mail folder access for Gnus"
-        (mail))
-    ("nngateway.el"
-        "posting news via mail gateways"
-        (news  mail))
-    ("nnheader.el"
-        "header access macros for Gnus and its backends"
-        (news))
-    ("nnimap.el"
-        "imap backend for Gnus"
-        (mail))
-    ("nnkiboze.el"
-        "select virtual news access for Gnus"
-        (news))
-    ("nnlistserv.el"
-        "retrieving articles via web mailing list archives"
-        (news  mail))
-    ("nnmail.el"
-        "mail support functions for the Gnus mail backends"
-        (news  mail))
-    ("nnmbox.el"
-        "mail mbox access for Gnus"
-        (news  mail))
-    ("nnmh.el"
-        "mhspool access for Gnus"
-        (news  mail))
-    ("nnml.el"
-        "mail spool access for Gnus"
-        (news  mail))
-    ("nnoo.el"
-        "OO Gnus Backends"
-        (news))
-    ("nnslashdot.el"
-        "interfacing with Slashdot"
-        (news))
-    ("nnsoup.el"
-        "SOUP access for Gnus"
-        (news  mail))
-    ("nnspool.el"
-        "spool access for GNU Emacs"
-        (news))
-    ("nntp.el"
-        "nntp access for Gnus"
-        (news))
-    ("nnultimate.el"
-        "interfacing with the Ultimate Bulletin Board system"
-        (news))
-    ("nnvirtual.el"
-        "virtual newsgroups access for Gnus"
-        (news))
-    ("nnwarchive.el"
-        "interfacing with web archives"
-        (news egroups mail-archive))
-    ("nnweb.el"
-        "retrieving articles via web search engines"
-        (news))
-    ("pop3.el"
-        "Post Office Protocol (RFC 1460) interface"
-        (mail))
-    ("qp.el"
-        "Quoted-Printable functions"
-        (mail  extensions))
-    ("rfc1843.el"
-        "HZ (rfc1843) decoding"
-        (news hz hz+ mail i18n))
-    ("rfc2045.el"
-        "functions for decoding rfc2045 headers"
-        nil)
-    ("rfc2047.el"
-        "functions for encoding and decoding rfc2047 messages"
-        nil)
-    ("rfc2104.el"
-        "RFC2104 Hashed Message Authentication Codes"
-        (mail))
-    ("rfc2231.el"
-        "functions for decoding rfc2231 headers"
-        nil)
-    ("score-mode.el"
-        "mode for editing Gnus score files"
-        (news  mail))
-    ("smiley-ems.el"
-        "displaying smiley faces"
-        (news mail multimedia))
-    ("starttls.el"
-        "STARTTLS functions"
-        (tls  ssl  openssl  mail  news))
-    ("utf7.el"
-        "UTF-7 encoding/decoding for Emacs"
-        (mail))
-    ("uudecode.el"
-        "elisp native uudecode"
-        (uudecode news))
-    ("webmail.el"
-        "interface of web mail"
-        (hotmail netaddress my-deja netscape))
     ("appt.el"
         "appointment notification functions"
         (calendar))
@@ -1540,6 +1243,303 @@
     ("eshell.el"
         "the Emacs command shell"
         (processes))
+    ("binhex.el"
+        "elisp native binhex decode"
+        (binhex news))
+    ("earcon.el"
+        "sound effects for messages"
+        nil)
+    ("flow-fill.el"
+        "interprete RFC2646 \"flowed\" text"
+        (mail))
+    ("format-spec.el"
+        "functions for formatting arbitrary formatting strings"
+        (tools))
+    ("gnus-agent.el"
+        "unplugged support for Gnus"
+        nil)
+    ("gnus-art.el"
+        "article mode commands for Gnus"
+        (news))
+    ("gnus-async.el"
+        "asynchronous support for Gnus"
+        (news))
+    ("gnus-audio.el"
+        "sound effects for Gnus"
+        (news  mail  multimedia))
+    ("gnus-bcklg.el"
+        "backlog functions for Gnus"
+        (news))
+    ("gnus-cache.el"
+        "cache interface for Gnus"
+        (news))
+    ("gnus-cite.el"
+        "parse citations in articles for Gnus"
+        nil)
+    ("gnus-cus.el"
+        "customization commands for Gnus"
+        (news))
+    ("gnus-demon.el"
+        "daemonic Gnus behaviour"
+        (news))
+    ("gnus-draft.el"
+        "draft message support for Gnus"
+        (news))
+    ("gnus-dup.el"
+        "suppression of duplicate articles in Gnus"
+        (news))
+    ("gnus-eform.el"
+        "a mode for editing forms for Gnus"
+        (news))
+    ("gnus-ems.el"
+        "functions for making Gnus work under different Emacsen"
+        (news))
+    ("gnus-gl.el"
+        "an interface to GroupLens for Gnus"
+        (news  score))
+    ("gnus-group.el"
+        "group mode commands for Gnus"
+        (news))
+    ("gnus-int.el"
+        "backend interface functions for Gnus"
+        (news))
+    ("gnus-kill.el"
+        "kill commands for Gnus"
+        (news))
+    ("gnus-logic.el"
+        "advanced scoring code for Gnus"
+        (news))
+    ("gnus-mh.el"
+        "mh-e interface for Gnus"
+        (news))
+    ("gnus-ml.el"
+        "mailing list minor mode for Gnus"
+        (news))
+    ("gnus-mlspl.el"
+        "a group params-based mail splitting mechanism"
+        (news  mail))
+    ("gnus-move.el"
+        "commands for moving Gnus from one server to another"
+        (news))
+    ("gnus-msg.el"
+        "mail and post interface for Gnus"
+        (news))
+    ("gnus-mule.el"
+        "provide backward compatibility function to GNUS"
+        (news  i18n))
+    ("gnus-nocem.el"
+        "NoCeM pseudo-cancellation treatment"
+        (news))
+    ("gnus-range.el"
+        "range and sequence functions for Gnus"
+        (news))
+    ("gnus-salt.el"
+        "alternate summary mode interfaces for Gnus"
+        (news))
+    ("gnus-score.el"
+        "scoring code for Gnus"
+        (news))
+    ("gnus-setup.el"
+        "initialization & setup for Gnus 5"
+        (news))
+    ("gnus-soup.el"
+        "SOUP packet writing support for Gnus"
+        (news  mail))
+    ("gnus-spec.el"
+        "format spec functions for Gnus"
+        (news))
+    ("gnus-srvr.el"
+        "virtual server support for Gnus"
+        (news))
+    ("gnus-start.el"
+        "startup functions for Gnus"
+        (news))
+    ("gnus-sum.el"
+        "summary mode commands for Gnus"
+        (news))
+    ("gnus-topic.el"
+        "a folding minor mode for Gnus group buffers"
+        (news))
+    ("gnus-undo.el"
+        "minor mode for undoing in Gnus"
+        (news))
+    ("gnus-util.el"
+        "utility functions for Gnus"
+        (news))
+    ("gnus-uu.el"
+        "extract (uu)encoded files in Gnus"
+        nil)
+    ("gnus-vm.el"
+        "vm interface for Gnus"
+        (news  mail))
+    ("gnus-win.el"
+        "window configuration functions for Gnus"
+        (news))
+    ("gnus.el"
+        "a newsreader for GNU Emacs"
+        (news  mail))
+    ("ietf-drums.el"
+        "functions for parsing RFC822bis headers"
+        nil)
+    ("imap.el"
+        "imap library"
+        (mail))
+    ("mail-parse.el"
+        "interface functions for parsing mail"
+        nil)
+    ("mail-prsvr.el"
+        "interface variables for parsing mail"
+        nil)
+    ("mail-source.el"
+        "functions for fetching mail"
+        (news  mail))
+    ("mailcap.el"
+        "MIME media types configuration"
+        (news  mail  multimedia))
+    ("message.el"
+        "composing mail and news messages"
+        (mail  news))
+    ("messcompat.el"
+        "making message mode compatible with mail mode"
+        (mail  news))
+    ("mm-bodies.el"
+        "functions for decoding MIME things"
+        nil)
+    ("mm-decode.el"
+        "functions for decoding MIME things"
+        nil)
+    ("mm-encode.el"
+        "functions for encoding MIME things "
+        nil)
+    ("mm-partial.el"
+        "showing message/partial"
+        (message partial))
+    ("mm-util.el"
+        "Utility functions for Mule and low level things"
+        nil)
+    ("mm-uu.el"
+        "return uu stuff as mm handles"
+        (postscript uudecode binhex shar forward news))
+    ("mm-view.el"
+        "functions for viewing MIME objects"
+        nil)
+    ("mml.el"
+        "package for parsing and validating MML documents"
+        nil)
+    ("nnagent.el"
+        "offline backend for Gnus"
+        (news  mail))
+    ("nnbabyl.el"
+        "rmail mbox access for Gnus"
+        (news  mail))
+    ("nndir.el"
+        "single directory newsgroup access for Gnus"
+        (news))
+    ("nndoc.el"
+        "single file access for Gnus"
+        (news))
+    ("nndraft.el"
+        "draft article access for Gnus"
+        (news))
+    ("nneething.el"
+        "arbitrary file access for Gnus"
+        (news  mail))
+    ("nnfolder.el"
+        "mail folder access for Gnus"
+        (mail))
+    ("nngateway.el"
+        "posting news via mail gateways"
+        (news  mail))
+    ("nnheader.el"
+        "header access macros for Gnus and its backends"
+        (news))
+    ("nnimap.el"
+        "imap backend for Gnus"
+        (mail))
+    ("nnkiboze.el"
+        "select virtual news access for Gnus"
+        (news))
+    ("nnlistserv.el"
+        "retrieving articles via web mailing list archives"
+        (news  mail))
+    ("nnmail.el"
+        "mail support functions for the Gnus mail backends"
+        (news  mail))
+    ("nnmbox.el"
+        "mail mbox access for Gnus"
+        (news  mail))
+    ("nnmh.el"
+        "mhspool access for Gnus"
+        (news  mail))
+    ("nnml.el"
+        "mail spool access for Gnus"
+        (news  mail))
+    ("nnoo.el"
+        "OO Gnus Backends"
+        (news))
+    ("nnslashdot.el"
+        "interfacing with Slashdot"
+        (news))
+    ("nnsoup.el"
+        "SOUP access for Gnus"
+        (news  mail))
+    ("nnspool.el"
+        "spool access for GNU Emacs"
+        (news))
+    ("nntp.el"
+        "nntp access for Gnus"
+        (news))
+    ("nnultimate.el"
+        "interfacing with the Ultimate Bulletin Board system"
+        (news))
+    ("nnvirtual.el"
+        "virtual newsgroups access for Gnus"
+        (news))
+    ("nnwarchive.el"
+        "interfacing with web archives"
+        (news egroups mail-archive))
+    ("nnweb.el"
+        "retrieving articles via web search engines"
+        (news))
+    ("pop3.el"
+        "Post Office Protocol (RFC 1460) interface"
+        (mail))
+    ("qp.el"
+        "Quoted-Printable functions"
+        (mail  extensions))
+    ("rfc1843.el"
+        "HZ (rfc1843) decoding"
+        (news hz hz+ mail i18n))
+    ("rfc2045.el"
+        "functions for decoding rfc2045 headers"
+        nil)
+    ("rfc2047.el"
+        "functions for encoding and decoding rfc2047 messages"
+        nil)
+    ("rfc2104.el"
+        "RFC2104 Hashed Message Authentication Codes"
+        (mail))
+    ("rfc2231.el"
+        "functions for decoding rfc2231 headers"
+        nil)
+    ("score-mode.el"
+        "mode for editing Gnus score files"
+        (news  mail))
+    ("smiley-ems.el"
+        "displaying smiley faces"
+        (news mail multimedia))
+    ("starttls.el"
+        "STARTTLS functions"
+        (tls  ssl  openssl  mail  news))
+    ("utf7.el"
+        "UTF-7 encoding/decoding for Emacs"
+        (mail))
+    ("uudecode.el"
+        "elisp native uudecode"
+        (uudecode news))
+    ("webmail.el"
+        "interface of web mail"
+        (hotmail netaddress my-deja netscape))
     ("ccl.el"
         "CCL (Code Conversion Language) compiler"
         (ccl  mule  multilingual  character set  coding-system))
@@ -1649,7 +1649,7 @@
         "translation of untranslatable utf-8 to CJK"
         (i18n))
     ("utf-8.el"
-        "Limited UTF-8 decoding/encoding support"
+        "limited UTF-8 decoding/encoding support"
         (multilingual  unicode  utf-8  i18n))
     ("china-util.el"
         "utilities for Chinese"
@@ -1897,6 +1897,9 @@
     ("net-utils.el"
         "network functions"
         (network comm))
+    ("netrc.el"
+        ".netrc parsing functionality"
+        (news))
     ("quickurl.el"
         "insert an URL based on text at point in buffer"
         (hypermedia))
@@ -2308,9 +2311,6 @@
     ("underline.el"
         "insert/remove underlining (done by overstriking) in Emacs"
         (wp))
-    ("xml-lite.el"
-        "an indentation-engine for XML"
-        (xml))
     ("tool-bar.el"
         "setting up the tool bar"
         (mouse frames))
diff --git a/lisp/loaddefs.el b/lisp/loaddefs.el
index c210a63218f..e5da51eb19e 100644
--- a/lisp/loaddefs.el
+++ b/lisp/loaddefs.el
@@ -2705,7 +2705,7 @@ See the documentation of that function for more information." t nil)
 
 ;;;***
 
-;;;### (autoloads nil "cc-langs" "progmodes/cc-langs.el" (15556 56060))
+;;;### (autoloads nil "cc-langs" "progmodes/cc-langs.el" (15557 64404))
 ;;; Generated autoloads from progmodes/cc-langs.el
 
 (defvar c-mode-syntax-table nil "\
@@ -2730,7 +2730,7 @@ Syntax table used in pike-mode buffers.")
 
 ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode
 ;;;;;;  c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el"
-;;;;;;  (15556 56060))
+;;;;;;  (15557 64405))
 ;;; Generated autoloads from progmodes/cc-mode.el
 
 (autoload (quote c-initialize-cc-mode) "cc-mode" nil nil nil)
@@ -2841,7 +2841,7 @@ Key bindings:
 ;;;***
 
 ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles"
-;;;;;;  "progmodes/cc-styles.el" (15556 56060))
+;;;;;;  "progmodes/cc-styles.el" (15557 64405))
 ;;; Generated autoloads from progmodes/cc-styles.el
 
 (autoload (quote c-set-style) "cc-styles" "\
@@ -2882,7 +2882,7 @@ and exists only for compatibility reasons." t nil)
 
 ;;;***
 
-;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (15556 56060))
+;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (15557 64405))
 ;;; Generated autoloads from progmodes/cc-vars.el
 
 (defconst c-emacs-features (let ((infodock-p (boundp (quote infodock-version))) (comments (let ((table (copy-syntax-table)) entry) (modify-syntax-entry 97 ". 12345678" table) (cond ((arrayp table) (setq entry (aref table 97)) (if (consp entry) (setq entry (car entry)))) ((fboundp (quote get-char-table)) (setq entry (get-char-table 97 table))) ((and (fboundp (quote char-table-p)) (char-table-p table)) (setq entry (car (char-table-range table [97])))) (t (error "CC Mode is incompatible with this version of Emacs"))) (if (= (logand (lsh entry -16) 255) 255) (quote 8-bit) (quote 1-bit))))) (if infodock-p (list comments (quote infodock)) (list comments))) "\
@@ -4198,7 +4198,7 @@ INHERIT-INPUT-METHOD." nil nil)
 ;;;;;;  customize-face 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" (15552 23095))
+;;;;;;  customize-set-value) "cus-edit" "cus-edit.el" (15561 31158))
 ;;; Generated autoloads from cus-edit.el
  (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'")
 
@@ -4284,10 +4284,16 @@ Show the buffer in another window, but don't select it." t nil)
 
 (autoload (quote customize-face) "cus-edit" "\
 Customize SYMBOL, which should be a face name or nil.
-If SYMBOL is nil, customize all faces." t nil)
+If SYMBOL is nil, customize all faces.
+
+Interactively, when point is on text which has a face specified,
+suggest to customized that face, if it's customizable." t nil)
 
 (autoload (quote customize-face-other-window) "cus-edit" "\
-Show customization buffer for face SYMBOL in other window." t nil)
+Show customization buffer for face SYMBOL in other window.
+
+Interactively, when point is on text which has a face specified,
+suggest to customized that face, if it's customizable." t nil)
 
 (autoload (quote customize-customized) "cus-edit" "\
 Customize all user options set since the last save in this session." t nil)
@@ -4840,7 +4846,7 @@ to provide correct modes for autoloaded files." nil nil)
 ;;;***
 
 ;;;### (autoloads (diary-mail-entries diary) "diary-lib" "calendar/diary-lib.el"
-;;;;;;  (15556 56042))
+;;;;;;  (15557 64393))
 ;;; Generated autoloads from calendar/diary-lib.el
 
 (autoload (quote diary) "diary-lib" "\
@@ -4918,7 +4924,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" (15556 56031))
+;;;;;;  "dired" "dired.el" (15557 64385))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches "-al" "\
@@ -5505,8 +5511,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX)." nil (
 ;;;***
 
 ;;;### (autoloads (easy-menu-change easy-menu-create-menu easy-menu-do-define
-;;;;;;  easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (15400
-;;;;;;  1475))
+;;;;;;  easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (15561
+;;;;;;  31234))
 ;;; Generated autoloads from emacs-lisp/easymenu.el
 
 (put (quote easy-menu-define) (quote lisp-indent-function) (quote defun))
@@ -6073,6 +6079,20 @@ With optional NODE, goes to that node." t nil)
 
 ;;;***
 
+;;;### (autoloads (ediff-cond-compile-for-xemacs-or-emacs) "ediff-hook"
+;;;;;;  "ediff-hook.el" (15561 31164))
+;;; Generated autoloads from ediff-hook.el
+
+(defvar ediff-window-setup-function)
+
+(autoload (quote ediff-cond-compile-for-xemacs-or-emacs) "ediff-hook" nil nil (quote macro))
+
+(ediff-cond-compile-for-xemacs-or-emacs (defun ediff-xemacs-init-menus nil (if (featurep (quote menubar)) (progn (add-submenu (quote ("Tools")) ediff-menu "OO-Browser...") (add-submenu (quote ("Tools")) ediff-merge-menu "OO-Browser...") (add-submenu (quote ("Tools")) epatch-menu "OO-Browser...") (add-submenu (quote ("Tools")) ediff-misc-menu "OO-Browser...") (add-menu-button (quote ("Tools")) "-------" "OO-Browser...")))) nil)
+
+(ediff-cond-compile-for-xemacs-or-emacs (progn (defvar ediff-menu (quote ("Compare" ["Two Files..." ediff-files t] ["Two Buffers..." ediff-buffers t] ["Three Files..." ediff-files3 t] ["Three Buffers..." ediff-buffers3 t] "---" ["Two Directories..." ediff-directories t] ["Three Directories..." ediff-directories3 t] "---" ["File with Revision..." ediff-revision t] ["Directory Revisions..." ediff-directory-revisions t] "---" ["Windows Word-by-word..." ediff-windows-wordwise t] ["Windows Line-by-line..." ediff-windows-linewise t] "---" ["Regions Word-by-word..." ediff-regions-wordwise t] ["Regions Line-by-line..." ediff-regions-linewise t]))) (defvar ediff-merge-menu (quote ("Merge" ["Files..." ediff-merge-files t] ["Files with Ancestor..." ediff-merge-files-with-ancestor t] ["Buffers..." ediff-merge-buffers t] ["Buffers with Ancestor..." ediff-merge-buffers-with-ancestor t] "---" ["Directories..." ediff-merge-directories t] ["Directories with Ancestor..." ediff-merge-directories-with-ancestor t] "---" ["Revisions..." ediff-merge-revisions t] ["Revisions with Ancestor..." ediff-merge-revisions-with-ancestor t] ["Directory Revisions..." ediff-merge-directory-revisions t] ["Directory Revisions with Ancestor..." ediff-merge-directory-revisions-with-ancestor t]))) (defvar epatch-menu (quote ("Apply Patch" ["To a file..." ediff-patch-file t] ["To a buffer..." ediff-patch-buffer t]))) (defvar ediff-misc-menu (quote ("Ediff Miscellanea" ["Ediff Manual..." ediff-documentation t] ["Customize Ediff..." ediff-customize t] ["List Ediff Sessions..." ediff-show-registry t] ["Use separate frame for Ediff control buffer..." ediff-toggle-multiframe :style toggle :selected (if (and (featurep (quote ediff-util)) (boundp (quote ediff-window-setup-function))) (eq ediff-window-setup-function (quote ediff-setup-windows-multiframe)))] ["Use a toolbar with Ediff control buffer" ediff-toggle-use-toolbar :style toggle :selected (if (featurep (quote ediff-tbar)) (ediff-use-toolbar-p))]))) (if (and (featurep (quote menubar)) (not (featurep (quote infodock))) (not (featurep (quote ediff-hook)))) (ediff-xemacs-init-menus))) (if (featurep (quote menu-bar)) (progn (defvar menu-bar-ediff-misc-menu (make-sparse-keymap "Ediff Miscellanea")) (fset (quote menu-bar-ediff-misc-menu) (symbol-value (quote menu-bar-ediff-misc-menu))) (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) (fset (quote menu-bar-epatch-menu) (symbol-value (quote menu-bar-epatch-menu))) (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) (fset (quote menu-bar-ediff-merge-menu) (symbol-value (quote menu-bar-ediff-merge-menu))) (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) (fset (quote menu-bar-ediff-menu) (symbol-value (quote menu-bar-ediff-menu))) (define-key menu-bar-ediff-menu [window] (quote ("This Window and Next Window" . compare-windows))) (define-key menu-bar-ediff-menu [ediff-windows-linewise] (quote ("Windows Line-by-line..." . ediff-windows-linewise))) (define-key menu-bar-ediff-menu [ediff-windows-wordwise] (quote ("Windows Word-by-word..." . ediff-windows-wordwise))) (define-key menu-bar-ediff-menu [separator-ediff-windows] (quote ("--"))) (define-key menu-bar-ediff-menu [ediff-regions-linewise] (quote ("Regions Line-by-line..." . ediff-regions-linewise))) (define-key menu-bar-ediff-menu [ediff-regions-wordwise] (quote ("Regions Word-by-word..." . ediff-regions-wordwise))) (define-key menu-bar-ediff-menu [separator-ediff-regions] (quote ("--"))) (define-key menu-bar-ediff-menu [ediff-dir-revision] (quote ("Directory Revisions..." . ediff-directory-revisions))) (define-key menu-bar-ediff-menu [ediff-revision] (quote ("File with Revision..." . ediff-revision))) (define-key menu-bar-ediff-menu [separator-ediff-directories] (quote ("--"))) (define-key menu-bar-ediff-menu [ediff-directories3] (quote ("Three Directories..." . ediff-directories3))) (define-key menu-bar-ediff-menu [ediff-directories] (quote ("Two Directories..." . ediff-directories))) (define-key menu-bar-ediff-menu [separator-ediff-files] (quote ("--"))) (define-key menu-bar-ediff-menu [ediff-buffers3] (quote ("Three Buffers..." . ediff-buffers3))) (define-key menu-bar-ediff-menu [ediff-files3] (quote ("Three Files..." . ediff-files3))) (define-key menu-bar-ediff-menu [ediff-buffers] (quote ("Two Buffers..." . ediff-buffers))) (define-key menu-bar-ediff-menu [ediff-files] (quote ("Two Files..." . ediff-files))) (define-key menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor] (quote ("Directory Revisions with Ancestor..." . ediff-merge-directory-revisions-with-ancestor))) (define-key menu-bar-ediff-merge-menu [ediff-merge-dir-revisions] (quote ("Directory Revisions..." . ediff-merge-directory-revisions))) (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor] (quote ("Revisions with Ancestor..." . ediff-merge-revisions-with-ancestor))) (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions] (quote ("Revisions..." . ediff-merge-revisions))) (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] (quote ("--"))) (define-key menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor] (quote ("Directories with Ancestor..." . ediff-merge-directories-with-ancestor))) (define-key menu-bar-ediff-merge-menu [ediff-merge-directories] (quote ("Directories..." . ediff-merge-directories))) (define-key menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] (quote ("--"))) (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] (quote ("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))) (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers] (quote ("Buffers..." . ediff-merge-buffers))) (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor] (quote ("Files with Ancestor..." . ediff-merge-files-with-ancestor))) (define-key menu-bar-ediff-merge-menu [ediff-merge-files] (quote ("Files..." . ediff-merge-files))) (define-key menu-bar-epatch-menu [ediff-patch-buffer] (quote ("To a Buffer..." . ediff-patch-buffer))) (define-key menu-bar-epatch-menu [ediff-patch-file] (quote ("To a File..." . ediff-patch-file))) (define-key menu-bar-ediff-misc-menu [emultiframe] (quote ("Toggle use of separate control buffer frame..." . ediff-toggle-multiframe))) (define-key menu-bar-ediff-misc-menu [eregistry] (quote ("List Ediff Sessions..." . ediff-show-registry))) (define-key menu-bar-ediff-misc-menu [ediff-cust] (quote ("Customize Ediff..." . ediff-customize))) (define-key menu-bar-ediff-misc-menu [ediff-doc] (quote ("Ediff Manual..." . ediff-documentation))))))
+
+;;;***
+
 ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el"
 ;;;;;;  (15517 64421))
 ;;; Generated autoloads from ediff-mult.el
@@ -6988,15 +7008,15 @@ This is used only in conjunction with `expand-add-abbrevs'." t nil)
 
 ;;;***
 
-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (15552 23097))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (15561 31347))
 ;;; Generated autoloads from progmodes/f90.el
 
 (autoload (quote f90-mode) "f90" "\
-Major mode for editing Fortran 90 code in free format.
+Major mode for editing Fortran 90,95 code in free format.
 
 \\[f90-indent-new-line] corrects current indentation and creates new indented line.
-\\[f90-indent-line] indents the current line correctly. 
-\\[f90-indent-subprogram] indents the current subprogram. 
+\\[f90-indent-line] indents the current line correctly.
+\\[f90-indent-subprogram] indents the current subprogram.
 
 Type `? or `\\[help-command] to display a list of built-in abbrevs for F90 keywords.
 
@@ -7005,46 +7025,44 @@ Key definitions:
 
 Variables controlling indentation style and extra features:
 
- f90-do-indent
+ `f90-do-indent'
     Extra indentation within do blocks.  (default 3)
- f90-if-indent
-    Extra indentation within if/select case/where/forall blocks. (default 3)
- f90-type-indent
+ `f90-if-indent'
+    Extra indentation within if/select case/where/forall blocks.  (default 3)
+ `f90-type-indent'
     Extra indentation within type/interface/block-data blocks.  (default 3)
- f90-program-indent
+ `f90-program-indent'
     Extra indentation within program/module/subroutine/function blocks.
-      (default 2)
- f90-continuation-indent
+    (default 2)
+ `f90-continuation-indent'
     Extra indentation applied to continuation lines.  (default 5)
- f90-comment-region
+ `f90-comment-region'
     String inserted by \\[f90-comment-region] at start of each line in 
     region.  (default \"!!!$\")
- f90-indented-comment-re
+ `f90-indented-comment-re'
     Regexp determining the type of comment to be intended like code.
     (default \"!\")
- f90-directive-comment-re
+ `f90-directive-comment-re'
     Regexp of comment-like directive like \"!HPF\\\\$\", not to be indented.
     (default \"!hpf\\\\$\")
- f90-break-delimiters
+ `f90-break-delimiters'
     Regexp holding list of delimiters at which lines may be broken.
     (default \"[-+*/><=,% \\t]\")
- f90-break-before-delimiters
+ `f90-break-before-delimiters'
     Non-nil causes `f90-do-auto-fill' to break lines before delimiters.
     (default t)
- f90-beginning-ampersand 
+ `f90-beginning-ampersand'
     Automatic insertion of & at beginning of continuation lines. (default t)
- f90-smart-end 
+ `f90-smart-end'
     From an END statement, check and fill the end using matching block start.
     Allowed values are 'blink, 'no-blink, and nil, which determine
-    whether to blink the matching beginning.) (default 'blink)
- f90-auto-keyword-case
-    Automatic change of case of keywords. (default nil)
+    whether to blink the matching beginning.  (default 'blink)
+ `f90-auto-keyword-case'
+    Automatic change of case of keywords.  (default nil)
     The possibilities are 'downcase-word, 'upcase-word, 'capitalize-word.
- f90-leave-line-no
-    Do not left-justify line numbers. (default nil)
- f90-startup-message
-    Set to nil to inhibit message first time F90 mode is used. (default t)
- f90-keywords-re
+ `f90-leave-line-no'
+    Do not left-justify line numbers.  (default nil)
+ `f90-keywords-re'
     List of keywords used for highlighting/upcase-keywords etc.
 
 Turning on F90 mode calls the value of the variable `f90-mode-hook'
@@ -7056,7 +7074,7 @@ with no args, if that value is non-nil." t nil)
 ;;;;;;  facemenu-remove-special facemenu-remove-all facemenu-remove-face-props
 ;;;;;;  facemenu-set-read-only facemenu-set-intangible facemenu-set-invisible
 ;;;;;;  facemenu-set-face-from-menu facemenu-set-background facemenu-set-foreground
-;;;;;;  facemenu-set-face) "facemenu" "facemenu.el" (15552 23095))
+;;;;;;  facemenu-set-face) "facemenu" "facemenu.el" (15557 64385))
 ;;; Generated autoloads from facemenu.el
  (define-key global-map "\M-g" 'facemenu-keymap)
  (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap)
@@ -7338,7 +7356,7 @@ the name is considered already unique; only the second substitution
 ;;;***
 
 ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options
-;;;;;;  find-ls-option) "find-dired" "find-dired.el" (15505 59086))
+;;;;;;  find-ls-option) "find-dired" "find-dired.el" (15561 31174))
 ;;; Generated autoloads from find-dired.el
 
 (defvar find-ls-option (if (eq system-type (quote berkeley-unix)) (quote ("-ls" . "-gilsb")) (quote ("-exec ls -ld {} \\;" . "-ld"))) "\
@@ -7381,7 +7399,7 @@ Thus ARG can also contain additional grep options." t nil)
 
 ;;;### (autoloads (ff-mouse-find-other-file-other-window ff-mouse-find-other-file
 ;;;;;;  ff-find-other-file ff-get-other-file) "find-file" "find-file.el"
-;;;;;;  (15400 1472))
+;;;;;;  (15561 31174))
 ;;; Generated autoloads from find-file.el
 
 (autoload (quote ff-get-other-file) "find-file" "\
@@ -7913,7 +7931,7 @@ Visit a file in Forms mode in other window." t nil)
 ;;;***
 
 ;;;### (autoloads (fortran-mode fortran-tab-mode-default) "fortran"
-;;;;;;  "progmodes/fortran.el" (15555 1627))
+;;;;;;  "progmodes/fortran.el" (15557 64405))
 ;;; Generated autoloads from progmodes/fortran.el
 
 (defvar fortran-tab-mode-default nil "\
@@ -8999,7 +9017,7 @@ Key bindings:
 ;;;### (autoloads (global-highlight-changes highlight-compare-with-file
 ;;;;;;  highlight-changes-rotate-faces highlight-changes-previous-change
 ;;;;;;  highlight-changes-next-change highlight-changes-mode highlight-changes-remove-highlight)
-;;;;;;  "hilit-chg" "hilit-chg.el" (15556 56033))
+;;;;;;  "hilit-chg" "hilit-chg.el" (15557 64386))
 ;;; Generated autoloads from hilit-chg.el
 
 (defvar highlight-changes-mode nil)
@@ -9236,12 +9254,15 @@ Also see `automatic-hscrolling'." t nil)
 ;;;;;;  ibuffer-add-saved-filters ibuffer-delete-saved-filters ibuffer-save-filters
 ;;;;;;  ibuffer-or-filter ibuffer-negate-filter ibuffer-exchange-filters
 ;;;;;;  ibuffer-decompose-filter ibuffer-pop-filter ibuffer-filter-disable
-;;;;;;  ibuffer-jump-to-filter-group ibuffer-pop-filter-group ibuffer-filters-to-filter-group
-;;;;;;  ibuffer-included-in-filters-p ibuffer-backward-filter-group
-;;;;;;  ibuffer-forward-filter-group ibuffer-toggle-filter-group
-;;;;;;  ibuffer-mouse-toggle-filter-group ibuffer-interactive-filter-by-mode
-;;;;;;  ibuffer-mouse-filter-by-mode ibuffer-auto-mode) "ibuf-ext"
-;;;;;;  "ibuf-ext.el" (15559 5574))
+;;;;;;  ibuffer-switch-to-saved-filter-groups ibuffer-delete-saved-filter-groups
+;;;;;;  ibuffer-save-filter-groups ibuffer-yank ibuffer-kill-line
+;;;;;;  ibuffer-kill-filter-group ibuffer-jump-to-filter-group ibuffer-clear-filter-groups
+;;;;;;  ibuffer-pop-filter-group ibuffer-set-filter-groups-by-mode
+;;;;;;  ibuffer-filters-to-filter-group ibuffer-included-in-filters-p
+;;;;;;  ibuffer-backward-filter-group ibuffer-forward-filter-group
+;;;;;;  ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group
+;;;;;;  ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (15561 31179))
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload (quote ibuffer-auto-mode) "ibuf-ext" "\
@@ -9282,12 +9303,40 @@ Move point backwards by COUNT filtering groups." t nil)
 (autoload (quote ibuffer-filters-to-filter-group) "ibuf-ext" "\
 Make the current filters into a filtering group." t nil)
 
+(autoload (quote ibuffer-set-filter-groups-by-mode) "ibuf-ext" "\
+Set the current filter groups to filter by mode." t nil)
+
 (autoload (quote ibuffer-pop-filter-group) "ibuf-ext" "\
 Remove the first filtering group." t nil)
 
+(autoload (quote ibuffer-clear-filter-groups) "ibuf-ext" "\
+Remove all filtering groups." t nil)
+
 (autoload (quote ibuffer-jump-to-filter-group) "ibuf-ext" "\
 Move point to the filter group whose name is NAME." t nil)
 
+(autoload (quote ibuffer-kill-filter-group) "ibuf-ext" "\
+Delete the filtering group named NAME." t nil)
+
+(autoload (quote ibuffer-kill-line) "ibuf-ext" nil t nil)
+
+(autoload (quote ibuffer-yank) "ibuf-ext" nil t nil)
+
+(autoload (quote ibuffer-save-filter-groups) "ibuf-ext" "\
+Save all active filter groups GROUPS as NAME.
+They are added to `ibuffer-saved-filter-groups'.  Interactively,
+prompt for NAME, and use the current filters." t nil)
+
+(autoload (quote ibuffer-delete-saved-filter-groups) "ibuf-ext" "\
+Delete saved filter groups with NAME.
+They are removed from `ibuffer-saved-filter-groups'." t nil)
+
+(autoload (quote ibuffer-switch-to-saved-filter-groups) "ibuf-ext" "\
+Set this buffer's filter groups to saved version with NAME.
+The value from `ibuffer-saved-filters' is used.
+If prefix argument ADD is non-nil, then add the saved filters instead
+of replacing the current filters." t nil)
+
 (autoload (quote ibuffer-filter-disable) "ibuf-ext" "\
 Disable all filters currently in effect in this buffer." t nil)
 
@@ -9442,8 +9491,8 @@ defaults to one." t nil)
 ;;;***
 
 ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter
-;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (15559
-;;;;;;  4758))
+;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (15561
+;;;;;;  31179))
 ;;; Generated autoloads from ibuf-macs.el
 
 (autoload (quote define-ibuffer-column) "ibuf-macs" "\
@@ -9519,7 +9568,7 @@ bound to the current value of the filter." nil (quote macro))
 ;;;***
 
 ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers)
-;;;;;;  "ibuffer" "ibuffer.el" (15559 12617))
+;;;;;;  "ibuffer" "ibuffer.el" (15561 31180))
 ;;; Generated autoloads from ibuffer.el
 
 (autoload (quote ibuffer-list-buffers) "ibuffer" "\
@@ -9545,7 +9594,7 @@ Optional argument NOSELECT means don't select the Ibuffer buffer.
 Optional argument SHRINK means shrink the buffer to minimal size.  The
 special value `onewindow' means always use another window.
 Optional argument FILTER-GROUPS is an initial set of filtering
-groups to use; see `ibuffer-filtering-groups'." t nil)
+groups to use; see `ibuffer-filter-groups'." t nil)
 
 ;;;***
 
@@ -11371,7 +11420,7 @@ If 4th arg LIST is non-nil, return a list of all such fields." nil nil)
 ;;;***
 
 ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup)
-;;;;;;  "mailabbrev" "mail/mailabbrev.el" (15552 23097))
+;;;;;;  "mailabbrev" "mail/mailabbrev.el" (15557 64401))
 ;;; Generated autoloads from mail/mailabbrev.el
 
 (autoload (quote mail-abbrevs-setup) "mailabbrev" "\
@@ -12077,7 +12126,7 @@ different buffer menu using the function `msb'." t nil)
 ;;;;;;  describe-current-coding-system describe-current-coding-system-briefly
 ;;;;;;  describe-coding-system describe-char-after describe-character-set
 ;;;;;;  list-charset-chars read-charset list-character-sets) "mule-diag"
-;;;;;;  "international/mule-diag.el" (15556 56053))
+;;;;;;  "international/mule-diag.el" (15557 64400))
 ;;; Generated autoloads from international/mule-diag.el
 
 (autoload (quote list-character-sets) "mule-diag" "\
@@ -13950,8 +13999,8 @@ were operated on recently." t nil)
 ;;;### (autoloads (clear-rectangle string-insert-rectangle string-rectangle
 ;;;;;;  delete-whitespace-rectangle open-rectangle insert-rectangle
 ;;;;;;  yank-rectangle kill-rectangle extract-rectangle delete-extract-rectangle
-;;;;;;  delete-rectangle move-to-column-force) "rect" "rect.el" (15552
-;;;;;;  23097))
+;;;;;;  delete-rectangle move-to-column-force) "rect" "rect.el" (15557
+;;;;;;  64391))
 ;;; Generated autoloads from rect.el
 
 (autoload (quote move-to-column-force) "rect" "\
@@ -15233,7 +15282,7 @@ Interesting variables:
 ;;;***
 
 ;;;### (autoloads (scroll-all-mode scroll-all-mode) "scroll-all"
-;;;;;;  "scroll-all.el" (15559 7260))
+;;;;;;  "scroll-all.el" (15561 31204))
 ;;; Generated autoloads from scroll-all.el
 
 (defvar scroll-all-mode nil "\
@@ -15256,7 +15305,7 @@ Toggle Scroll-All minor mode." t nil)
 ;;;;;;  mail-archive-file-name mail-header-separator send-mail-function
 ;;;;;;  mail-yank-ignored-headers mail-interactive mail-self-blind
 ;;;;;;  mail-specify-envelope-from mail-from-style) "sendmail" "mail/sendmail.el"
-;;;;;;  (15505 59088))
+;;;;;;  (15561 31320))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style (quote angles) "\
@@ -15871,7 +15920,7 @@ which smileys to operate on and which images to use for them." t nil)
 ;;;***
 
 ;;;### (autoloads (smtpmail-send-it) "smtpmail" "mail/smtpmail.el"
-;;;;;;  (15417 7425))
+;;;;;;  (15561 31320))
 ;;; Generated autoloads from mail/smtpmail.el
 
 (autoload (quote smtpmail-send-it) "smtpmail" nil nil nil)
@@ -17695,7 +17744,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"." nil
 ;;;***
 
 ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm"
-;;;;;;  "tmm.el" (15556 56039))
+;;;;;;  "tmm.el" (15557 64393))
 ;;; Generated autoloads from tmm.el
  (define-key global-map "\M-`" 'tmm-menubar)
  (define-key global-map [f10] 'tmm-menubar)
@@ -17775,7 +17824,7 @@ Show TODO list." t nil)
 
 ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu
 ;;;;;;  tool-bar-local-item tool-bar-add-item tool-bar-mode) "tool-bar"
-;;;;;;  "toolbar/tool-bar.el" (15552 23097))
+;;;;;;  "toolbar/tool-bar.el" (15557 64408))
 ;;; Generated autoloads from toolbar/tool-bar.el
 
 (defvar tool-bar-mode nil "\
@@ -19532,7 +19581,8 @@ Zone-mode does two things:
 
 ;;;***
 
-;;;### (autoloads nil nil ("international/mule-cmds.el" "eshell/esh-ext.el"
+;;;### (autoloads nil nil ("term/x-win.el" "progmodes/cc-cmds.el"
+;;;;;;  "replace.el" "menu-bar.el" "international/mule-cmds.el" "eshell/esh-ext.el"
 ;;;;;;  "emulation/viper-ex.el" "calc/calc-bin.el" "loadup.el" "frame.el"
 ;;;;;;  "faces.el" "ediff-init.el" "bindings.el" "international/mule-conf.el"
 ;;;;;;  "calendar/cal-french.el" "textmodes/texnfo-upd.el" "language/slovak.el"
@@ -19545,21 +19595,21 @@ Zone-mode does two things:
 ;;;;;;  "eshell/em-glob.el" "eshell/em-dirs.el" "eshell/em-cmpl.el"
 ;;;;;;  "eshell/em-alias.el" "emacs-lisp/lisp.el" "mail/uce.el" "gnus/mm-encode.el"
 ;;;;;;  "tempo.el" "emulation/viper-util.el" "gnus/mml.el" "gnus/mm-view.el"
-;;;;;;  "calendar/cal-menu.el" "indent.el" "ediff-wind.el" "ediff-hook.el"
-;;;;;;  "term/sun-mouse.el" "emacs-lisp/lisp-mode.el" "progmodes/mantemp.el"
-;;;;;;  "progmodes/idlw-toolbar.el" "progmodes/ebnf-yac.el" "progmodes/ebnf-otz.el"
-;;;;;;  "progmodes/ebnf-iso.el" "progmodes/ebnf-bnf.el" "play/meese.el"
-;;;;;;  "play/gametree.el" "obsolete/x-menu.el" "obsolete/x-apollo.el"
-;;;;;;  "obsolete/uncompress.el" "obsolete/sun-fns.el" "obsolete/sun-curs.el"
-;;;;;;  "obsolete/sc.el" "obsolete/rnews.el" "obsolete/profile.el"
-;;;;;;  "obsolete/ooutline.el" "obsolete/c-mode.el" "mail/vms-pmail.el"
-;;;;;;  "mail/rfc822.el" "mail/rfc2368.el" "mail/mspools.el" "mail/mh-seq.el"
-;;;;;;  "mail/mh-funcs.el" "mail/mailpost.el" "mail/mailheader.el"
-;;;;;;  "mail/blessmail.el" "language/romanian.el" "language/misc-lang.el"
-;;;;;;  "language/ethiopic.el" "language/english.el" "language/devanagari.el"
-;;;;;;  "international/swedish.el" "international/latin-9.el" "international/latin-8.el"
-;;;;;;  "international/latin-5.el" "international/latin-4.el" "international/latin-3.el"
-;;;;;;  "international/latin-2.el" "international/latin-1.el" "international/ja-dic-utl.el"
+;;;;;;  "calendar/cal-menu.el" "indent.el" "ediff-wind.el" "term/sun-mouse.el"
+;;;;;;  "emacs-lisp/lisp-mode.el" "progmodes/mantemp.el" "progmodes/idlw-toolbar.el"
+;;;;;;  "progmodes/ebnf-yac.el" "progmodes/ebnf-otz.el" "progmodes/ebnf-iso.el"
+;;;;;;  "progmodes/ebnf-bnf.el" "play/meese.el" "play/gametree.el"
+;;;;;;  "obsolete/x-menu.el" "obsolete/x-apollo.el" "obsolete/uncompress.el"
+;;;;;;  "obsolete/sun-fns.el" "obsolete/sun-curs.el" "obsolete/sc.el"
+;;;;;;  "obsolete/rnews.el" "obsolete/profile.el" "obsolete/ooutline.el"
+;;;;;;  "obsolete/c-mode.el" "mail/vms-pmail.el" "mail/rfc822.el"
+;;;;;;  "mail/rfc2368.el" "mail/mspools.el" "mail/mh-seq.el" "mail/mh-funcs.el"
+;;;;;;  "mail/mailpost.el" "mail/mailheader.el" "mail/blessmail.el"
+;;;;;;  "language/romanian.el" "language/misc-lang.el" "language/ethiopic.el"
+;;;;;;  "language/english.el" "language/devanagari.el" "international/swedish.el"
+;;;;;;  "international/latin-9.el" "international/latin-8.el" "international/latin-5.el"
+;;;;;;  "international/latin-4.el" "international/latin-3.el" "international/latin-2.el"
+;;;;;;  "international/latin-1.el" "international/ja-dic-utl.el"
 ;;;;;;  "international/ja-dic-cnv.el" "international/iso-swed.el"
 ;;;;;;  "international/iso-ascii.el" "calc/calcsel2.el" "calc/calccomp.el"
 ;;;;;;  "calc/calc-yank.el" "calc/calc-vec.el" "calc/calc-units.el"
@@ -19639,19 +19689,18 @@ Zone-mode does two things:
 ;;;;;;  "calc/calc-graph.el" "ediff-diff.el" "ediff-ptch.el" "pcvs-parse.el"
 ;;;;;;  "gnus/mail-source.el" "gnus/mm-decode.el" "gnus/mm-util.el"
 ;;;;;;  "gnus/nneething.el" "international/ucs-tables.el" "allout.el"
-;;;;;;  "cus-load.el" "cus-start.el" "finder-inf.el" "format.el"
-;;;;;;  "help.el" "isearch.el" "mouse.el" "pcvs-info.el" "window.el"
-;;;;;;  "calc/calc-misc.el" "gnus/gnus-ems.el" "gnus/gnus-sum.el"
-;;;;;;  "gnus/gnus-uu.el" "gnus/nnimap.el" "gnus/nnmbox.el" "gnus/nnwarchive.el"
-;;;;;;  "gnus/pop3.el" "calendar/cal-tex.el" "emacs-lisp/byte-opt.el"
-;;;;;;  "emacs-lisp/lucid.el" "international/utf-8.el" "progmodes/ada-prj.el"
-;;;;;;  "progmodes/idlw-rinfo.el" "textmodes/fill.el" "custom.el"
-;;;;;;  "files.el" "menu-bar.el" "register.el" "replace.el" "simple.el"
-;;;;;;  "startup.el" "subr.el" "net/netrc.el" "play/gamegrid.el"
-;;;;;;  "progmodes/cc-align.el" "progmodes/cc-bytecomp.el" "progmodes/cc-cmds.el"
-;;;;;;  "progmodes/cc-compat.el" "progmodes/cc-defs.el" "progmodes/cc-engine.el"
-;;;;;;  "progmodes/cc-menus.el" "term/x-win.el" "subdirs.el" "eshell/esh-groups.el")
-;;;;;;  (15559 13260 596690))
+;;;;;;  "cus-start.el" "format.el" "help.el" "isearch.el" "mouse.el"
+;;;;;;  "pcvs-info.el" "window.el" "calc/calc-misc.el" "gnus/gnus-ems.el"
+;;;;;;  "gnus/gnus-sum.el" "gnus/gnus-uu.el" "gnus/nnimap.el" "gnus/nnmbox.el"
+;;;;;;  "gnus/nnwarchive.el" "gnus/pop3.el" "calendar/cal-tex.el"
+;;;;;;  "emacs-lisp/byte-opt.el" "emacs-lisp/lucid.el" "international/utf-8.el"
+;;;;;;  "progmodes/ada-prj.el" "progmodes/idlw-rinfo.el" "textmodes/fill.el"
+;;;;;;  "custom.el" "files.el" "register.el" "simple.el" "startup.el"
+;;;;;;  "subr.el" "net/netrc.el" "play/gamegrid.el" "progmodes/cc-align.el"
+;;;;;;  "progmodes/cc-bytecomp.el" "progmodes/cc-compat.el" "progmodes/cc-defs.el"
+;;;;;;  "progmodes/cc-engine.el" "progmodes/cc-menus.el" "cus-load.el"
+;;;;;;  "finder-inf.el" "subdirs.el" "eshell/esh-groups.el") (15561
+;;;;;;  41889 615042))
 
 ;;;***
 
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 48c210d51e2..53f6cde1d79 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
-;; Author: Andrew Choi <akochoi@i-cable.com>
+;; Author: Andrew Choi <akochoi@mac.com>
 
 ;; This file is part of GNU Emacs.
 
@@ -120,7 +120,7 @@
 ;; X Window emulation in macterm.c is not complete enough to start a
 ;; frame without a minibuffer properly.  Call this to tell ediff
 ;; library to use a single frame.
-(ediff-toggle-multiframe)
+; (ediff-toggle-multiframe)
 
 ;; Setup to use the Mac clipboard.  The functions mac-cut-function and
 ;; mac-paste-function are defined in mac.c.
@@ -215,6 +215,16 @@ ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman")
 ;; big5 or sjis
 (setq file-name-coding-system 'mac-roman)
 
+;; If Emacs is started from the Finder, change the default directory
+;; to the user's home directory.
+(if (string= default-directory "/")
+    (cd "~"))
+
+;; Tell Emacs to use pipes instead of pty's for processes because the
+;; latter sometimes lose characters.  Pty support is compiled in since
+;; ange-ftp will not work without it.
+(setq process-connection-type nil)
+
 ;; (prefer-coding-system 'mac-roman)
 
 ;;