From f2b89e21fa128a8685fd1dd09d5fc0126b2ade58 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 19 Aug 2002 06:11:52 +0000 Subject: [PATCH] (main): In the case of --unibyte, instead of aborting on finding non-empty buffer, make it unibyte. --- src/emacs.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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); + } } } } -- 2.39.2