mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-15 07:41:09 -08:00
Merge branch 'master' into scratch/igc
This commit is contained in:
commit
2a34ced4cd
378 changed files with 6547 additions and 3703 deletions
|
|
@ -6365,7 +6365,7 @@ make_string_from_utf8 (const char *text, ptrdiff_t nbytes)
|
|||
/* If TEXT is a valid UTF-8 string, we can convert it to a Lisp
|
||||
string directly. Otherwise, we need to decode it. */
|
||||
if (chars == nbytes || bytes == nbytes)
|
||||
return make_specified_string (text, chars, nbytes, true);
|
||||
return make_multibyte_string (text, chars, nbytes);
|
||||
else
|
||||
{
|
||||
struct coding_system coding;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue