2001-01-19 Michael Kifer <kifer@cs.sunysb.edu>

        * viper.el: call initial-major-mode on startup.

	* ediff.el (ediff-patch-file): use better defaults.

	* ediff-vers.el: fix for 8+3 DOS file systems

2001-01-19  Colin Walters <walters@cis.ohio-state.edu>

	* ediff-util.el (ediff-compare-custom-diffs-maybe): put diff in
	diff mode, if available.

2001-01-19  Vin Shelton <acs@xemacs.org>

	* ediff-hook.el (ediff-xemacs-init-menus): fixed add-menu-button

2001-01-19  Steve Youngs  <youngs@xemacs.org>

	* ediff-init.el (subst-char-in-string): Define and use it, unless
	it's already defined.

1 files changed, 25 insertions, 17 deletions

diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index ca16b06959a..646be7636e4 100644
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -139,7 +139,7 @@
 (put 'feedmail-spray 'custom-loads '("feedmail"))
 (put 'idlwave-external-programs 'custom-loads '("idlwave"))
 (put 'strokes 'custom-loads '("strokes"))
-(put 'mouse 'custom-loads '("faces" "mouse" "menu-bar" "avoid" "mouse-sel" "msb" "mwheel" "strokes" "tooltip" "artist" "goto-addr"))
+(put 'mouse 'custom-loads '("faces" "mouse" "menu-bar" "avoid" "mouse-sel" "msb" "mwheel" "strokes" "tooltip" "goto-addr" "artist"))
 (put 'nnmail-various 'custom-loads '("nnmail"))
 (put 'smiley 'custom-loads '("smiley-ems"))
 (put 'extensions 'custom-loads '("generic" "time-stamp" "wid-edit" "cust-print" "eldoc" "page-ext"))
@@ -216,8 +216,8 @@
 (put 'font-lock 'custom-loads '("frame" "faces" "font-lock"))
 (put 'auto-save 'custom-loads '("files" "startup"))
 (put 'tpu 'custom-loads '("tpu-edt" "tpu-extras"))
-(put 'gnus-cite 'custom-loads '("gnus-cite"))
 (put 'viper-hooks 'custom-loads '("viper-init"))
+(put 'gnus-cite 'custom-loads '("gnus-cite"))
 (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"))
@@ -271,7 +271,7 @@
 (put 'generic-x 'custom-loads '("generic-x"))
 (put 'partial-completion 'custom-loads '("complete"))
 (put 'whitespace 'custom-loads '("whitespace"))
-(put 'maint 'custom-loads '("gulp" "lisp-mnt" "emacsbug"))
+(put 'maint 'custom-loads '("emacsbug" "gulp" "lisp-mnt"))
 (put 'pages 'custom-loads '("page-ext"))
 (put 'message-interface 'custom-loads '("message"))
 (put 'diary 'custom-loads '("calendar" "diary-lib"))
@@ -284,7 +284,7 @@
 (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"))
+(put 'emacs 'custom-loads '("files" "cus-edit" "ebnf2ps"))
 (put 'comint 'custom-loads '("comint"))
 (put 'isearch 'custom-loads '("isearch"))
 (put 'reftex-fontification-configurations 'custom-loads '("reftex-vars"))
@@ -297,7 +297,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" "copyright" "compile" "ebrowse" "etags" "glasses" "make-mode" "rcompile"))
+(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"))
@@ -319,7 +319,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" "shell" "term" "sh-script" "rlogin"))
+(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 'vhdl-highlight-faces 'custom-loads '("vhdl-mode"))
@@ -405,8 +405,8 @@
 (put 'gnus-windows 'custom-loads '("gnus-win"))
 (put 'reftex-label-support 'custom-loads '("reftex-vars"))
 (put 'gnus-article-buttons 'custom-loads '("gnus-art"))
-(put 'old-c 'custom-loads '("c-mode"))
 (put 'gnus-summary 'custom-loads '("gnus-sum" "gnus"))
+(put 'old-c 'custom-loads '("c-mode" "cc-vars"))
 (put 'compilation 'custom-loads '("compile"))
 (put 'ediff-highlighting 'custom-loads '("ediff-init"))
 (put 'idlwave-shell-general-setup 'custom-loads '("idlw-shell" "idlwave"))
@@ -418,8 +418,8 @@
 (put 'ispell 'custom-loads '("ispell"))
 (put 'auto-revert 'custom-loads '("autorevert"))
 (put 'advice 'custom-loads '("advice"))
-(put 'eshell-util 'custom-loads '("esh-util"))
 (put 'picture 'custom-loads '("picture"))
+(put 'eshell-util 'custom-loads '("esh-util"))
 (put 'gnus-group 'custom-loads '("gnus-topic" "gnus"))
 (put 'eudc-bbdb 'custom-loads '("eudc-vars"))
 (put 'reftex-referencing-labels 'custom-loads '("reftex-vars"))
@@ -454,7 +454,7 @@
 (put 'bibtex 'custom-loads '("bibtex"))
 (put 'faces 'custom-loads '("loaddefs" "faces" "facemenu" "cus-edit" "font-lock" "hilit-chg" "paren" "ps-print" "speedbar" "time" "wid-edit" "woman" "gnus" "message" "cwarn" "make-mode"))
 (put 'gnus-summary-various 'custom-loads '("gnus-sum"))
-(put 'applications 'custom-loads '("calendar" "cus-edit" "uniquify" "spell" "eshell"))
+(put 'applications 'custom-loads '("calendar" "cus-edit" "uniquify" "eshell" "spell"))
 (put 'ebrowse-member 'custom-loads '("ebrowse"))
 (put 'terminal 'custom-loads '("terminal"))
 (put 'shadow 'custom-loads '("shadowfile" "shadow"))
@@ -474,7 +474,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" "cus-edit" "faces" "ooutline" "hl-line" "vcursor" "whitespace" "picture" "auto-show" "hscroll"))
+(put 'editing 'custom-loads '("simple" "view" "indent" "paragraphs" "cus-edit" "faces" "outline" "hl-line" "vcursor" "whitespace" "auto-show" "hscroll" "picture"))
 (put 'crisp 'custom-loads '("crisp"))
 (put 'nroff 'custom-loads '("nroff-mode"))
 (put 'gnus-group-icons 'custom-loads '("gnus-group"))
@@ -491,7 +491,7 @@
 (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" "starttls" "emacsbug" "feedmail" "mail-extr" "mail-hist" "mailalias" "metamail" "mh-e" "mspools" "rmail" "sendmail" "smtpmail" "supercite" "uce" "fortune" "eudc-vars"))
+(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"))
 (put 'fast-lock 'custom-loads '("fast-lock"))
@@ -501,7 +501,7 @@
 (put 'dired 'custom-loads '("files" "ls-lisp" "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" "ooutline" "outline"))
+(put 'outlines 'custom-loads '("allout" "outline" "ooutline"))
 (put 'latin1-display 'custom-loads '("latin1-disp"))
 (put 'paragraphs 'custom-loads '("paragraphs"))
 (put 'ebrowse 'custom-loads '("ebrowse"))
@@ -566,9 +566,9 @@
 (put 'glasses 'custom-loads '("glasses"))
 (put 'vhdl-style 'custom-loads '("vhdl-mode"))
 (put 'tempo 'custom-loads '("tempo"))
-(put 'c 'custom-loads '("tooltip" "cc-vars" "c-mode" "cmacexp" "cpp" "hideif"))
+(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" "compile" "sql" "flyspell" "rcompile" "rlogin"))
+(put 'processes 'custom-loads '("ansi-color" "comint" "cus-edit" "executable" "pcomplete" "shell" "term" "metamail" "rcompile" "rlogin" "compile" "sql" "flyspell"))
 (put 'ebnf2ps 'custom-loads '("ebnf2ps"))
 (put 'sendmail 'custom-loads '("sendmail"))
 (put 'gnus-article-signature 'custom-loads '("gnus-art"))
@@ -664,6 +664,8 @@
 (custom-put-if-not 'find-tag-marker-ring-length 'standard-value t)
 (custom-put-if-not 'elide-head 'custom-version "21.1")
 (custom-put-if-not 'elide-head 'group-documentation "Eliding copyright headers and the like in source files.")
+(custom-put-if-not 'confirm-kill-emacs 'custom-version "21.1")
+(custom-put-if-not 'confirm-kill-emacs 'standard-value t)
 (custom-put-if-not 'vc-rcs-checkout-switches 'custom-version "21.1")
 (custom-put-if-not 'vc-rcs-checkout-switches 'standard-value t)
 (custom-put-if-not 'change-log-conditionals-face 'custom-version "21.1")
@@ -734,7 +736,7 @@ the tasks accomplished by such tools.")
 (custom-put-if-not 'sql-electric-stuff 'standard-value t)
 (custom-put-if-not 'gnus-ignored-from-addresses 'custom-version "21.1")
 (custom-put-if-not 'gnus-ignored-from-addresses 'standard-value t)
-(custom-put-if-not 'ansi-colors 'custom-version "20.7")
+(custom-put-if-not 'ansi-colors 'custom-version "21.1")
 (custom-put-if-not 'ansi-colors 'group-documentation "Translating SGR control sequences to faces.
 This translation effectively colorizes strings and regions based upon
 SGR control sequences embedded in the text.  SGR (Select Graphic
@@ -777,6 +779,8 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (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 'backward-delete-char-untabify-method 'custom-version "20.3")
+(custom-put-if-not 'backward-delete-char-untabify-method 'standard-value t)
 (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")
@@ -931,7 +935,7 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (custom-put-if-not 'show-paren-ring-bell-on-mismatch 'standard-value t)
 (custom-put-if-not 'rmail-default-body-file 'custom-version "20.3")
 (custom-put-if-not 'rmail-default-body-file 'standard-value t)
-(custom-put-if-not 'ansi-color-for-comint-mode 'custom-version "20.8")
+(custom-put-if-not 'ansi-color-for-comint-mode 'custom-version "21.1")
 (custom-put-if-not 'ansi-color-for-comint-mode 'standard-value t)
 (custom-put-if-not 'gnus-emphasize-whitespace-regexp 'custom-version "21.1")
 (custom-put-if-not 'gnus-emphasize-whitespace-regexp 'standard-value t)
@@ -961,8 +965,12 @@ as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
 (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 'isearch-lazy-highlight 'custom-version "21.1")
+(custom-put-if-not 'isearch-lazy-highlight 'standard-value t)
 (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 'next-line-add-newlines 'custom-version "21.1")
+(custom-put-if-not 'next-line-add-newlines 'standard-value t)
 (custom-put-if-not 'gnus-group-highlight-words-alist 'custom-version "21.1")
 (custom-put-if-not 'gnus-group-highlight-words-alist 'standard-value t)
 (custom-put-if-not 'dabbrev-ignored-buffer-names 'custom-version "20.3")
@@ -1030,7 +1038,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" "gnus-start" "mule" "vc" "paths" "sgml-mode" "net-utils" "cperl-mode" "rmail" "font-lock" "gnus-nocem" "vc-hooks" "paren" "faces" "fortran" "etags" "cus-edit" "frame" "vc-sccs" "gnus-group" "gnus-sum" "files" "add-log" "find-func" "wid-edit" "vc-rcs" "nnmail" "message" "vc-cvs" "simple" "gnus-agent" "gnus-art" "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" "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" "dabbrev" "isearch" "gnus-start" "mule" "vc" "ansi-color" "paths" "sgml-mode" "net-utils" "cperl-mode" "rmail" "font-lock" "gnus-nocem" "vc-hooks" "paren" "faces" "fortran" "etags" "cus-edit" "frame" "vc-sccs" "gnus-group" "gnus-sum" "add-log" "find-func" "wid-edit" "vc-rcs" "files" "nnmail" "message" "vc-cvs" "simple" "gnus-agent" "gnus-art" "browse-url" "speedbar") ("20.8" "sql"))
  "For internal use by custom.")
 
 (provide 'cus-load)