Make obsolete --unibyte argument do nothing (Bug#6886).

* src/emacs.c (main): Remove --unibyte handling (Bug#6886).

* lisp/startup.el (command-line-1): Issue warning for ignored arguments
--unibyte, etc (Bug#6886).

* doc/lispref/nonascii.texi (Text Representations):
* doc/lispref/loading.texi (Loading Non-ASCII):
* doc/lispref/compile.texi (Byte Compilation): Don't mention obsolete
--unibyte command-line argument.

3 files changed, 5 insertions, 68 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 485099c7bf1..a1e67df99e2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs.c (main): Remove handling of --unibyte arg (Bug#6886).
+
 2010-08-22  Andreas Schwab  <schwab@linux-m68k.org>
 
         * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA_LISP
diff --git a/src/doc.c b/src/doc.c
index a8601d930d0..f8ab9d081b9 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -285,8 +285,7 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition)
                                 to - (get_doc_string_buffer + offset));
   else
     {
-      /* Let the data determine whether the string is multibyte,
-         even if Emacs is running in --unibyte mode.  */
+      /* The data determines whether the string is multibyte.  */
       int nchars = multibyte_chars_in_text (get_doc_string_buffer + offset,
                                             to - (get_doc_string_buffer + offset));
       return make_string_from_bytes (get_doc_string_buffer + offset,
diff --git a/src/emacs.c b/src/emacs.c
index dc1453a34ac..397d3d9ad27 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1332,68 +1332,6 @@ main (int argc, char **argv)
   init_atimer ();
   running_asynch_code = 0;
 
-  /* Handle --unibyte and the EMACS_UNIBYTE envvar,
-     but not while dumping.  */
-  if (1)
-    {
-      int inhibit_unibyte = 0;
-
-      /* --multibyte overrides EMACS_UNIBYTE.  */
-      if (argmatch (argv, argc, "-no-unibyte", "--no-unibyte", 4, NULL, &skip_args)
-          || argmatch (argv, argc, "-multibyte", "--multibyte", 4, NULL, &skip_args)
-          /* Ignore EMACS_UNIBYTE before dumping.  */
-          || (!initialized && noninteractive))
-        inhibit_unibyte = 1;
-
-      /* --unibyte requests that we set up to do everything with single-byte
-         buffers and strings.  We need to handle this before calling
-         init_lread, init_editfns and other places that generate Lisp strings
-         from text in the environment.  */
-      /* Actually this shouldn't be needed as of 20.4 in a generally
-         unibyte environment.  As handa says, environment values
-         aren't now decoded; also existing buffers are now made
-         unibyte during startup if .emacs sets unibyte.  Tested with
-         8-bit data in environment variables and /etc/passwd, setting
-         unibyte and Latin-1 in .emacs. -- Dave Love  */
-      if (argmatch (argv, argc, "-unibyte", "--unibyte", 4, NULL, &skip_args)
-          || argmatch (argv, argc, "-no-multibyte", "--no-multibyte", 4, NULL, &skip_args)
-          || (getenv ("EMACS_UNIBYTE") && !inhibit_unibyte))
-        {
-          Lisp_Object old_log_max;
-          Lisp_Object symbol, tail;
-
-          symbol = intern_c_string ("enable-multibyte-characters");
-          Fset_default (symbol, Qnil);
-
-          if (initialized)
-            {
-              /* Erase pre-dump messages in *Messages* now so no abort.  */
-              old_log_max = Vmessage_log_max;
-              XSETFASTINT (Vmessage_log_max, 0);
-              message_dolog ("", 0, 1, 0);
-              Vmessage_log_max = old_log_max;
-            }
-
-          for (tail = Vbuffer_alist; CONSP (tail);
-               tail = XCDR (tail))
-            {
-              Lisp_Object buffer;
-
-              buffer = Fcdr (XCAR (tail));
-              /* Make a multibyte buffer unibyte.  */
-              if (BUF_Z_BYTE (XBUFFER (buffer)) > BUF_Z (XBUFFER (buffer)))
-                {
-                  struct buffer *current = current_buffer;
-
-                  set_buffer_temp (XBUFFER (buffer));
-                  Fset_buffer_multibyte (Qnil);
-                  set_buffer_temp (current);
-                }
-            }
-          message ("Warning: unibyte sessions are obsolete and will disappear");
-        }
-    }
-
   no_loadup
     = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
 
@@ -1792,10 +1730,6 @@ const struct standard_args standard_args[] =
   { "-script", "--script", 100, 1 },
   { "-daemon", "--daemon", 99, 0 },
   { "-help", "--help", 90, 0 },
-  { "-no-unibyte", "--no-unibyte", 83, 0 },
-  { "-multibyte", "--multibyte", 82, 0 },
-  { "-unibyte", "--unibyte", 81, 0 },
-  { "-no-multibyte", "--no-multibyte", 80, 0 },
   { "-nl", "--no-loadup", 70, 0 },
   /* -d must come last before the options handled in startup.el.  */
   { "-d", "--display", 60, 1 },