/*
* Two-pass configuration so that we can pick up global config
* (e.g. `quotes') before having it overridden by specific
- * config (`text-quotes'), irrespective of the order in which
+ * config (`man-quotes'), irrespective of the order in which
* they occur.
*/
for (p = source; p; p = p->next) {
ret.th = snewn(ep - wp + 1, wchar_t);
memcpy(ret.th, wp, (ep - wp + 1) * sizeof(wchar_t));
} else if (!ustricmp(p->keyword, L"man-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"man-headnumbers")) {
ret.headnumbers = utob(uadv(p->keyword));
} else if (!ustricmp(p->keyword, L"man-mindepth")) {
ret.filename = dupstr(adv(p->origkeyword));
} else if (!ustricmp(p->keyword, L"man-bullet")) {
ret.bullet = uadv(p->keyword);
- } else if (!ustricmp(p->keyword, L"text-quotes")) {
+ } else if (!ustricmp(p->keyword, L"man-quotes")) {
if (*uadv(p->keyword) && *uadv(uadv(p->keyword))) {
ret.lquote = uadv(p->keyword);
ret.rquote = uadv(ret.lquote);