2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>

	* ediff-diff.el (ediff-make-diff2-buffer): Removed bogus checks
	for remote files.
	(ediff-coding-system-for-read): replaced the no-conversion default
	with raw-text.
	* ediff-init.el: Removed :version from defcustom vars.
	* ediff-util.el (ediff-compute-custom-diffs-maybe): Better
	handling of the diff mode
	* ediff.texi: Added ediff-coding-system-for-read.
	* viper.texi: typos

3 files changed, 20 insertions, 3 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 578645409f7..d19845e071d 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-12  Michael Kifer <kifer@cs.sunysb.edu>
+        
+        * viper.texi: Fixed typos.
+        
+        * ediff.texi: Added ediff-coding-system-for-read.
+        
 2001-02-11  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus.texi (Pterodactyl Gnus): Added.
diff --git a/man/ediff.texi b/man/ediff.texi
index 384e3e8ee1c..ce8ed1d14d0 100644
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -1725,6 +1725,17 @@ such as @samp{-w} that ignore certain kinds of changes.  However,
 Ediff does not let you use the option @samp{-c}, as it doesn't recognize this
 format yet.
 
+@item ediff-coding-system-for-read
+@itemx ediff-coding-system-for-read
+@vindex ediff-coding-system-for-read
+This variable specifies the coding system to use when reading the output
+that the programs @code{diff3} and @code{diff} send to Emacs. The default
+is @code{raw-text}, and this should work fine in Unix and in most
+cases under Windows NT/95/98/2000. There are @code{diff} programs
+for which the default option doesn't work under Windows. In such cases,
+@code{raw-text-dos} might work. If not, you will have to experiment with
+other coding systems or use GNU diff.
+
 @item ediff-patch-program
 The program to use to apply patches.  Since there are certain
 incompatibilities between the different versions of the patch program, the
diff --git a/man/viper.texi b/man/viper.texi
index e391b144c92..b62f1e097e3 100644
--- a/man/viper.texi
+++ b/man/viper.texi
@@ -559,7 +559,7 @@ function instead.
 
 Viper uses @key{ESC} as a switch between Insert and Vi states.  Emacs uses
 @key{ESC} for Meta.  The Meta key is very important in Emacs since many
-finctions are accessible only via that key as @kbd{M-x function-name}.
+functions are accessible only via that key as @kbd{M-x function-name}.
 Therefore, we need to simulate it somehow.  In Viper's Vi, Insert, and
 Replace states, the meta key is set to be @kbd{C-\}.  Thus, to get
 @kbd{M-x}, you should type @kbd{C-\ x} (if the keyboard has no Meta key).
@@ -679,7 +679,7 @@ Having found the appropriate command, it can be then executed by typing
 
 To avoid confusing the beginner (at Viper level 1 and 2), Viper makes only the
 standard Vi keys available in Insert state.  The implication is that
-Emacs major modes cannot be used Insert state.
+Emacs major modes cannot be used in Insert state.
 It is strongly recommended that as soon as you are comfortable, make the
 Emacs state bindings visible (by changing your user level to 3 or higher).
 @xref{Customization},
@@ -4449,7 +4449,7 @@ lindstro@@biostat.wisc.edu (Mary Lindstrom),
 minakaji@@osaka.email.ne.jp (Mikio Nakajima),
 Mark.Bordas@@East.Sun.COM (Mark Bordas),
 meyering@@comco.com (Jim Meyering),
-mrb@@Eng.Sun.COM (Martin Buchholz),
+martin@@xemacs.org (Martin Buchholz),
 mveiga@@dit.upm.es (Marcelino Veiga Tuimil),
 paulk@@summit.esg.apertus.com (Paul Keusemann),
 pfister@@cs.sunysb.edu (Hanspeter Pfister),