aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIto Hiroyuki <ZXB01226@nifty.com>2010-08-02 10:33:35 +0000
committerIto Hiroyuki <ZXB01226@nifty.com>2010-08-02 10:33:35 +0000
commit3b56230efa916f7c3a33a7433e781679e21bebc6 (patch)
tree2ba8043d2d236c5dc183275ca5f3599638c2799c
parent* [w3m-dev 04348] Re: "important" bugs from bugs.debian.org (diff)
downloadw3m-3b56230efa916f7c3a33a7433e781679e21bebc6.tar.gz
w3m-3b56230efa916f7c3a33a7433e781679e21bebc6.zip
Revert the change of using ATTR_TITLE if ATTR_ALT is empty.
-rw-r--r--ChangeLog7
-rw-r--r--file.c11
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 <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
@@ -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 <sys/types.h>
#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) {