Guest User

Untitled

a guest
Aug 16th, 2018
63
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.31 KB | None | 0 0
  1. diff --git w3m_CVS-1.1051/file.c w3m/file.c
  2. index d4c47fd..f0920e4 100644
  3. --- w3m_CVS-1.1051/file.c
  4. +++ w3m/file.c
  5. @@ -5020,10 +5020,17 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
  6. HTMLlineproc1(tmp->ptr, h_env);
  7. return 1;
  8. case HTML_META:
  9. - p = q = NULL;
  10. + p = q = r = NULL;
  11. parsedtag_get_value(tag, ATTR_HTTP_EQUIV, &p);
  12. parsedtag_get_value(tag, ATTR_CONTENT, &q);
  13. #ifdef USE_M17N
  14. + parsedtag_get_value(tag, ATTR_CHARSET, &r);
  15. + if (r) {
  16. + /* <meta charset=""> */
  17. + SKIP_BLANKS(r);
  18. + meta_charset = wc_guess_charset(r, 0);
  19. + }
  20. + else
  21. if (p && q && !strcasecmp(p, "Content-Type") &&
  22. (q = strcasestr(q, "charset")) != NULL) {
  23. q += 7;
  24. diff --git w3m_CVS-1.1051/html.c w3m/html.c
  25. index 2359ca0..dce8b3c 100644
  26. --- w3m_CVS-1.1051/html.c
  27. +++ w3m/html.c
  28. @@ -37,8 +37,8 @@ unsigned char ALST_TABLE[] =
  29. ATTR_CELLPADDING, ATTR_VSPACE, ATTR_CORE
  30. };
  31. #define MAXA_TABLE MAXA_CORE + 6
  32. -unsigned char ALST_META[] = { ATTR_HTTP_EQUIV, ATTR_CONTENT, ATTR_CORE };
  33. -#define MAXA_META MAXA_CORE + 2
  34. +unsigned char ALST_META[] = { ATTR_HTTP_EQUIV, ATTR_CONTENT, ATTR_CHARSET, ATTR_CORE };
  35. +#define MAXA_META MAXA_CORE + 3
  36. unsigned char ALST_FRAME[] = { ATTR_SRC, ATTR_NAME, ATTR_CORE };
  37. #define MAXA_FRAME MAXA_CORE + 2
  38. unsigned char ALST_FRAMESET[] = { ATTR_COLS, ATTR_ROWS, ATTR_CORE };
Add Comment
Please, Sign In to add comment