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.

5 files changed, 26 insertions, 23 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12a2ffce5bd..9452ac294dd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
 
+        * startup.el (command-line-1): Issue warning for ignored arguments
+        --unibyte, etc (Bug#6886).
+
+2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
+
         * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix (Bug#6880).
 
 2010-08-22  Leo  <sdl.web@gmail.com>
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 4effdddff6a..8d681b4f673 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -33,10 +33,9 @@ VPATH = $(srcdir)
 # to use an absolute file name.
 EMACS = ${abs_top_builddir}/src/emacs
 
-# Command line flags for Emacs.  This must include --multibyte,
-# otherwise some files will not compile.
+# Command line flags for Emacs.
 
-EMACSOPT = -batch --no-site-file --multibyte
+EMACSOPT = -batch --no-site-file
 
 # Extra flags to pass to the byte compiler
 BYTE_COMPILE_EXTRA_FLAGS =
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 59d6ff42c97..84b8db3e9ca 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -326,8 +326,7 @@ Return t if file exists."
             (with-current-buffer buffer
               ;; So that we don't get completely screwed if the
               ;; file is encoded in some complicated character set,
-              ;; read it with real decoding, as a multibyte buffer,
-              ;; even if this is a --unibyte Emacs session.
+              ;; read it with real decoding, as a multibyte buffer.
               (set-buffer-multibyte t)
               ;; Don't let deactivate-mark remain set.
               (let (deactivate-mark)
@@ -346,12 +345,7 @@ Return t if file exists."
             (eval-buffer buffer nil
                          ;; This is compatible with what `load' does.
                          (if purify-flag file fullname)
-                         ;; If this Emacs is running with --unibyte,
-                         ;; convert multibyte strings to unibyte
-                         ;; after reading them.
-;;                       (not (default-value 'enable-multibyte-characters))
-                         nil t
-                         ))
+                         nil t))
         (let (kill-buffer-hook kill-buffer-query-functions)
           (kill-buffer buffer)))
       (do-after-load-evaluation fullname)
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 871b690f007..df997b76585 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -32,10 +32,9 @@ srcdir = $(CURDIR)/..
 
 EMACS = $(THISDIR)/../bin/emacs.exe
 
-# Command line flags for Emacs.  This must include --multibyte,
-# otherwise some files will not compile.
+# Command line flags for Emacs.
 
-EMACSOPT = -batch --no-init-file --no-site-file --multibyte
+EMACSOPT = -batch --no-init-file --no-site-file
 
 # Extra flags to pass to the byte compiler
 BYTE_COMPILE_EXTRA_FLAGS =
diff --git a/lisp/startup.el b/lisp/startup.el
index 76e11491c0c..72169799acf 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -785,15 +785,16 @@ opening the first frame (e.g. open a connection to an X server).")
                 argi (match-string 1 argi)))
         (when (string-match "\\`--." orig-argi)
           (let ((completion (try-completion argi longopts)))
-            (if (eq completion t)
-                (setq argi (substring argi 1))
-              (if (stringp completion)
-                  (let ((elt (assoc completion longopts)))
-                    (or elt
-                        (error "Option `%s' is ambiguous" argi))
-                    (setq argi (substring (car elt) 1)))
-                (setq argval nil
-                      argi orig-argi)))))
+            (cond ((eq completion t)
+                   (setq argi (substring argi 1)))
+                  ((stringp completion)
+                   (let ((elt (assoc completion longopts)))
+                     (unless elt
+                       (error "Option `%s' is ambiguous" argi))
+                     (setq argi (substring (car elt) 1))))
+                  (t
+                   (setq argval nil
+                         argi orig-argi)))))
         (cond
          ;; The --display arg is handled partly in C, partly in Lisp.
          ;; When it shows up here, we just put it back to be handled
@@ -2231,6 +2232,11 @@ A fancy display is used on graphic displays, normal otherwise."
                      (move-to-column (1- cl1-column)))
                    (setq cl1-column 0))
 
+                  ;; These command lines now have no effect.
+                  ((string-match "\\`--?\\(no-\\)?\\(uni\\|multi\\)byte$" argi)
+                   (display-warning 'initialization
+                                    (format "Ignoring obsolete arg %s" argi)))
+
                   ((equal argi "--")
                    (setq just-files t))
                   (t