Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git w3m_CVS-1.1051/file.c w3m/file.c
- index d4c47fd..f0920e4 100644
- --- w3m_CVS-1.1051/file.c
- +++ w3m/file.c
- @@ -5020,10 +5020,17 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
- HTMLlineproc1(tmp->ptr, h_env);
- return 1;
- case HTML_META:
- - p = q = NULL;
- + p = q = r = NULL;
- parsedtag_get_value(tag, ATTR_HTTP_EQUIV, &p);
- parsedtag_get_value(tag, ATTR_CONTENT, &q);
- #ifdef USE_M17N
- + parsedtag_get_value(tag, ATTR_CHARSET, &r);
- + if (r) {
- + /* <meta charset=""> */
- + SKIP_BLANKS(r);
- + meta_charset = wc_guess_charset(r, 0);
- + }
- + else
- if (p && q && !strcasecmp(p, "Content-Type") &&
- (q = strcasestr(q, "charset")) != NULL) {
- q += 7;
- diff --git w3m_CVS-1.1051/html.c w3m/html.c
- index 2359ca0..dce8b3c 100644
- --- w3m_CVS-1.1051/html.c
- +++ w3m/html.c
- @@ -37,8 +37,8 @@ unsigned char ALST_TABLE[] =
- ATTR_CELLPADDING, ATTR_VSPACE, ATTR_CORE
- };
- #define MAXA_TABLE MAXA_CORE + 6
- -unsigned char ALST_META[] = { ATTR_HTTP_EQUIV, ATTR_CONTENT, ATTR_CORE };
- -#define MAXA_META MAXA_CORE + 2
- +unsigned char ALST_META[] = { ATTR_HTTP_EQUIV, ATTR_CONTENT, ATTR_CHARSET, ATTR_CORE };
- +#define MAXA_META MAXA_CORE + 3
- unsigned char ALST_FRAME[] = { ATTR_SRC, ATTR_NAME, ATTR_CORE };
- #define MAXA_FRAME MAXA_CORE + 2
- unsigned char ALST_FRAMESET[] = { ATTR_COLS, ATTR_ROWS, ATTR_CORE };
Add Comment
Please, Sign In to add comment