w3m

commit 17230278d1ffbf89bc5fcbc36658e0445742876c
parent da3315260b6524a56a2d5d762ae6c910e9955996
Author: htrb <htrb>
Date:   Mon,  2 Aug 2010 10:33:35 +0000

Revert the change of using ATTR_TITLE if ATTR_ALT is empty.

Diffstat:
M
ChangeLog
 | 
5
+++++
M
file.c
 | 
9
++-------

2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-31  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
+
+	* [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  <ZXB01226@nifty.com>
 
 	* [w3m-dev 04348] Re: "important" bugs from bugs.debian.org
diff --git a/file.c b/file.c
@@ -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) {