# HG changeset patch # User Kenichi Handa # Date 1029737512 0 # Node ID 313a80e39c2acd44cc92b61d442232a4bf22851e # Parent 705b93129869138798fdda297209b4c4e12627ae (main): In the case of --unibyte, instead of aborting on finding non-empty buffer, make it unibyte. diff -r 705b93129869 -r 313a80e39c2a src/emacs.c --- a/src/emacs.c Mon Aug 19 06:11:15 2002 +0000 +++ b/src/emacs.c Mon Aug 19 06:11:52 2002 +0000 @@ -1270,12 +1270,15 @@ 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); + } } } }