From 3b56230efa916f7c3a33a7433e781679e21bebc6 Mon Sep 17 00:00:00 2001 From: Ito Hiroyuki Date: Mon, 2 Aug 2010 10:33:35 +0000 Subject: Revert the change of using ATTR_TITLE if ATTR_ALT is empty. --- ChangeLog | 7 ++++++- file.c | 11 +++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64dcc6d..d97baab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-07-31 Tatsuya Kinoshita + + * [w3m-dev 04350] Re: w3m's bugs from bugs.debian.org + * file.c (process_img): Revert the change of using ATTR_TITLE if ATTR_ALT is empty. + 2010-07-30 Ito Hiroyuki * [w3m-dev 04348] Re: "important" bugs from bugs.debian.org @@ -9073,4 +9078,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.1023 2010/07/30 08:57:49 htrb Exp $ +$Id: ChangeLog,v 1.1024 2010/08/02 10:33:35 htrb Exp $ diff --git a/file.c b/file.c index 49664d6..dd460fa 100644 --- a/file.c +++ b/file.c @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.262 2010/07/30 08:57:49 htrb Exp $ */ +/* $Id: file.c,v 1.263 2010/08/02 10:33:35 htrb Exp $ */ #include "fm.h" #include #include "myctype.h" @@ -3228,15 +3228,10 @@ process_img(struct parsed_tag *tag, int width) p = remove_space(p); q = NULL; parsedtag_get_value(tag, ATTR_ALT, &q); + if (!pseudoInlines && (q == NULL || (*q == '\0' && ignore_null_img_alt))) + return tmp; t = q; parsedtag_get_value(tag, ATTR_TITLE, &t); - if (q == NULL || (*q == '\0' && ignore_null_img_alt)) { - if (!pseudoInlines && (t == NULL || - (*t == '\0' && ignore_null_img_alt))) - return tmp; - q = t; - } - w = -1; if (parsedtag_get_value(tag, ATTR_WIDTH, &w)) { if (w < 0) { -- cgit v1.2.3