Mercurial > emacs
comparison src/xdisp.c @ 37100:bb0f5c949199
(reseat_to_string): Undo last change.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Fri, 30 Mar 2001 15:11:53 +0000 |
parents | f48e8fc252ee |
children | d22db00cb35b |
comparison
equal
deleted
inserted
replaced
37099:497b2466113f | 37100:bb0f5c949199 |
---|---|
4004 it->current.dpvec_index = -1; | 4004 it->current.dpvec_index = -1; |
4005 xassert (charpos >= 0); | 4005 xassert (charpos >= 0); |
4006 | 4006 |
4007 /* If STRING is specified, use its multibyteness, otherwise use the | 4007 /* If STRING is specified, use its multibyteness, otherwise use the |
4008 setting of MULTIBYTE, if specified. */ | 4008 setting of MULTIBYTE, if specified. */ |
4009 if (STRINGP (string)) | 4009 if (multibyte >= 0) |
4010 it->multibyte_p = STRING_MULTIBYTE (string); | |
4011 else if (multibyte >= 0) | |
4012 it->multibyte_p = multibyte > 0; | 4010 it->multibyte_p = multibyte > 0; |
4013 | 4011 |
4014 if (s == NULL) | 4012 if (s == NULL) |
4015 { | 4013 { |
4016 xassert (STRINGP (string)); | 4014 xassert (STRINGP (string)); |