aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--main.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index aaebef9..7fc4abe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-02-07 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+ * [emacs-w3m:02733] for emacs-w3m better rendering with inline image
+ * main.c (MAIN): activeImage = TRUE when -halfdump & display_image=1
+
+2002-02-07 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
* [w3m-dev 03006] fix form order in table
* file.c (process_form): static
fix form index order
@@ -2865,4 +2870,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.305 2002/02/07 14:15:59 ukai Exp $
+$Id: ChangeLog,v 1.306 2002/02/07 14:44:47 ukai Exp $
diff --git a/main.c b/main.c
index 19fcc8a..66ec6a5 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.79 2002/02/05 12:31:27 ukai Exp $ */
+/* $Id: main.c,v 1.80 2002/02/07 14:44:47 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -733,6 +733,10 @@ MAIN(int argc, char **argv, char **envp)
setupscreen();
#endif /* not SIGWINCH */
}
+#ifdef USE_IMAGE
+ else if (w3m_halfdump && displayImage)
+ activeImage = TRUE;
+#endif
#ifdef SIGCHLD
signal(SIGCHLD, sig_chld);
#endif