aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2003-02-24 16:27:34 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2003-02-24 16:27:34 +0000
commit296f837c0a58d49260a7020a0ba2f407fc07400a (patch)
tree5a61015766d825617f0cd50f47130df5fa507680
parentversion.c.in: cvs version (diff)
downloadw3m-296f837c0a58d49260a7020a0ba2f407fc07400a.tar.gz
w3m-296f837c0a58d49260a7020a0ba2f407fc07400a.zip
[w3m-dev-en 00891] Re: w3m 0.4 has been released!
* image.c (getCharSize): set W3M_TTY here, before Imgdisplay invoke (openImgdisplay): no need setting W3M_TTY here From: Hironori SAKAMOTO <h-saka@lsi.nec.co.jp>
-rw-r--r--ChangeLog8
-rw-r--r--image.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 35de64f..80f4968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-25 Hironori SAKAMOTO <h-saka@lsi.nec.co.jp>
+
+ * [w3m-dev-en 00891] Re: w3m 0.4 has been released!
+ * image.c (getCharSize): set W3M_TTY here, before Imgdisplay invoke
+ (openImgdisplay): no need setting W3M_TTY here
+
2003-02-25 Fumitoshi UKAI <ukai@debian.or.jp>
* version.c.in: cvs version
@@ -7245,4 +7251,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.763 2003/02/24 16:24:14 ukai Exp $
+$Id: ChangeLog,v 1.764 2003/02/24 16:27:34 ukai Exp $
diff --git a/image.c b/image.c
index 53c3f00..099b3ad 100644
--- a/image.c
+++ b/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.33 2003/02/13 12:54:37 ukai Exp $ */
+/* $Id: image.c,v 1.34 2003/02/24 16:27:36 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
@@ -51,6 +51,7 @@ getCharSize()
Str tmp;
int w = 0, h = 0;
+ set_environ("W3M_TTY", ttyname_tty());
tmp = Strnew();
if (!strchr(Imgdisplay, '/'))
Strcat_m_charp(tmp, w3m_auxbin_dir(), "/", NULL);
@@ -96,7 +97,6 @@ openImgdisplay()
/* child */
char *cmd;
setup_child(FALSE, 2, -1);
- set_environ("W3M_TTY", ttyname_tty());
if (!strchr(Imgdisplay, '/'))
cmd = Strnew_m_charp(w3m_auxbin_dir(), "/", Imgdisplay, NULL)->ptr;
else