Revert r362148.
Breaks UTF-8 input for new or having only 7bit characters present files. Reported by: glebius
This commit is contained in:
parent
450d86fc7f
commit
1a176e87df
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=362515
@ -1237,10 +1237,7 @@ file_encinit(SCR *sp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 1. Check for valid UTF-8.
|
* Detect UTF-8 and fallback to the locale/preset encoding.
|
||||||
* 2. Check if fallback fileencoding is set and is NOT UTF-8.
|
|
||||||
* 3. Check if user locale's encoding is NOT UTF-8.
|
|
||||||
* 4. Use ISO8859-1 as last resort.
|
|
||||||
*
|
*
|
||||||
* XXX
|
* XXX
|
||||||
* A manually set O_FILEENCODING indicates the "fallback
|
* A manually set O_FILEENCODING indicates the "fallback
|
||||||
@ -1249,13 +1246,9 @@ file_encinit(SCR *sp)
|
|||||||
*/
|
*/
|
||||||
if (looks_utf8(buf, blen) > 1)
|
if (looks_utf8(buf, blen) > 1)
|
||||||
o_set(sp, O_FILEENCODING, OS_STRDUP, "utf-8", 0);
|
o_set(sp, O_FILEENCODING, OS_STRDUP, "utf-8", 0);
|
||||||
else if (O_ISSET(sp, O_FILEENCODING) &&
|
else if (!O_ISSET(sp, O_FILEENCODING) ||
|
||||||
strcasecmp(O_STR(sp, O_FILEENCODING), "utf-8") != 0)
|
!strcasecmp(O_STR(sp, O_FILEENCODING), "utf-8"))
|
||||||
/* Use fileencoding as is */ ;
|
|
||||||
else if (strcasecmp(codeset(), "utf-8") != 0)
|
|
||||||
o_set(sp, O_FILEENCODING, OS_STRDUP, codeset(), 0);
|
o_set(sp, O_FILEENCODING, OS_STRDUP, codeset(), 0);
|
||||||
else
|
|
||||||
o_set(sp, O_FILEENCODING, OS_STRDUP, "iso8859-1", 0);
|
|
||||||
|
|
||||||
conv_enc(sp, O_FILEENCODING, 0);
|
conv_enc(sp, O_FILEENCODING, 0);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user