* NEWS: Declare unibyte sessions obsolete.

* emacs.c (USAGE1): Remove --(no-)multibyte, --(no-)unibyte.
(main): Use enable-multibyte-characters rather than
default-enable-multibyte-characters.  Output a warning message when
running a unibyte session.
* mule.texi (Enabling Multibyte):
* cmdargs.texi (General Variables): Remove EMACS_UNIBYTE.
(Initial Options): Remove --(no-)multibyte, --(no-)unibyte.

3 files changed, 10 insertions, 41 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index aa6d942d8c7..ce6f6c5ff12 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mule.texi (Enabling Multibyte):
+        * cmdargs.texi (General Variables): Remove EMACS_UNIBYTE.
+        (Initial Options): Remove --(no-)multibyte, --(no-)unibyte.
+
 2009-08-20  Glenn Morris  <rgm@gnu.org>
 
         * cal-xtra.texi (Non-Gregorian Diary): Mention ``Adar I'' special case.
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 1438c19c123..ca153a7e57c 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -333,27 +333,6 @@ Enable the Emacs Lisp debugger for errors in the init file.
 @xref{Error Debugging,, Entering the Debugger on an Error, elisp, The
 GNU Emacs Lisp Reference Manual}.
 
-@item --unibyte
-@opindex --unibyte
-@itemx --no-multibyte
-@opindex --no-multibyte
-@cindex unibyte operation, command-line argument
-Do almost everything with single-byte buffers and strings.
-All buffers and strings are unibyte unless you (or a Lisp program)
-explicitly ask for a multibyte buffer or string.  (Note that Emacs
-always loads Lisp files in multibyte mode, even if @samp{--unibyte} is
-specified; see @ref{Enabling Multibyte}.)  Setting the environment
-variable @env{EMACS_UNIBYTE} has the same effect
-(@pxref{General Variables}).
-
-@item --multibyte
-@opindex --multibyte
-@itemx --no-unibyte
-@opindex --no-unibyte
-Inhibit the effect of @env{EMACS_UNIBYTE}, so that Emacs
-uses multibyte characters by default, as usual.
-@end table
-
 @node Command Example
 @appendixsec Command Argument Example
 
@@ -479,12 +458,6 @@ variables to be set, but it uses their values if they are set.
 @item CDPATH
 Used by the @code{cd} command to search for the directory you specify,
 when you specify a relative directory name.
-@item EMACS_UNIBYTE
-@cindex unibyte operation, environment variable
-Defining this environment variable with a nonempty value directs Emacs
-to do almost everything with single-byte buffers and strings.  It is
-equivalent to using the @samp{--unibyte} command-line option on each
-invocation.  @xref{Initial Options}.
 @item EMACSDATA
 Directory for the architecture-independent files that come with Emacs.
 This is used to initialize the Lisp variable @code{data-directory}.
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 663011d6f32..c630ba48e63 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -249,8 +249,8 @@ limitations.
 
 @cindex turn multibyte support on or off
   Under very special circumstances, you may want to disable multibyte
-character support, either for Emacs as a whole, or for a single
-buffer.  When multibyte characters are disabled in a buffer, we call
+character support, for a specific buffer.
+When multibyte characters are disabled in a buffer, we call
 that @dfn{unibyte mode}.  In unibyte mode, each character in the
 buffer has a character code ranging from 0 through 255 (0377 octal); 0
 through 127 (0177 octal) represent @acronym{ASCII} characters, and 128
@@ -268,22 +268,12 @@ Coding}.  Unlike @code{find-file-literally}, finding a file as
 @samp{raw-text} doesn't disable format conversion, uncompression, or
 auto mode selection.
 
-@vindex enable-multibyte-characters
-@cindex environment variables, and non-@acronym{ASCII} characters
-  To turn off multibyte character support by default, start Emacs with
-the @samp{--unibyte} option (@pxref{Initial Options}), or set the
-environment variable @env{EMACS_UNIBYTE}.
-With @samp{--unibyte}, multibyte strings are not created during
-initialization from the values of environment variables,
-@file{/etc/passwd} entries etc., even if those contain
-non-@acronym{ASCII} characters.
-
 @cindex Lisp files, and multibyte operation
 @cindex multibyte operation, and Lisp files
 @cindex unibyte operation, and Lisp files
 @cindex init file, and non-@acronym{ASCII} characters
-  Emacs normally loads Lisp files as multibyte, regardless of whether
-you used @samp{--unibyte}.  This includes the Emacs initialization
+  Emacs normally loads Lisp files as multibyte.
+This includes the Emacs initialization
 file, @file{.emacs}, and the initialization files of Emacs packages
 such as Gnus.  However, you can specify unibyte loading for a
 particular Lisp file, by putting @w{@samp{-*-unibyte: t;-*-}} in a