From: Kenichi Handa <handa@m17n.org>
Date: Mon, 19 Aug 2002 06:11:52 +0000 (+0000)
Subject: (main): In the case of --unibyte, instead of aborting on
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~433
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f2b89e21fa128a8685fd1dd09d5fc0126b2ade58;p=emacs.git

(main): In the case of --unibyte, instead of aborting on
finding non-empty buffer, make it unibyte.
---

diff --git a/src/emacs.c b/src/emacs.c
index 1157f0ee2dc..afbad1cd58e 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1270,12 +1270,15 @@ main (argc, argv, envp)
 	      Lisp_Object buffer;
 
 	      buffer = Fcdr (XCAR (tail));
-	      /* Verify that all buffers are empty now, as they
-		 ought to be.  */
-	      if (BUF_Z (XBUFFER (buffer)) > BUF_BEG (XBUFFER (buffer)))
-		abort ();
-	      /* It is safe to do this crudely in an empty buffer.  */
-	      XBUFFER (buffer)->enable_multibyte_characters = Qnil;
+	      /* Make all multibyte buffers 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, Qnil);
+		  set_buffer_temp (current);
+		}
 	    }
 	}
     }