From d87fabeacea32abba73d67f991f9e523991369c7 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 27 Jun 2004 13:18:32 +0000 Subject: Sort out error handling everywhere a charset name is converted into an integer charset ID. [originally from svn r4317] --- bk_text.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'bk_text.c') diff --git a/bk_text.c b/bk_text.c index d7c539c..6df426e 100644 --- a/bk_text.c +++ b/bk_text.c @@ -126,9 +126,7 @@ static textconfig text_configure(paragraph *source) { if (!ustricmp(p->keyword, L"text-indent")) { ret.indent = utoi(uadv(p->keyword)); } else if (!ustricmp(p->keyword, L"text-charset")) { - char *csname = utoa_dup(uadv(p->keyword), CS_ASCII); - ret.charset = charset_from_localenc(csname); - sfree(csname); + ret.charset = charset_from_ustr(&p->fpos, uadv(p->keyword)); } else if (!ustricmp(p->keyword, L"text-filename")) { sfree(ret.filename); ret.filename = dupstr(adv(p->origkeyword)); -- cgit v1.1