commit 896328cca48f8b246f1defac93473d1ce6deef88
parent 454da250d63e289c9f870fdaa85ac08fa74bd66c
Author: ukai <ukai>
Date: Sat, 26 Oct 2002 11:19:47 +0000
[w3m-dev-en 00788]
* fm.h (displayImage): FALSE ifndef USE_IMAGE
* rc.c (displayImage): display_image even if USE_IMAGE undefined
(sync_with_options): display_image is forced to be FALSE
ifndef USE_IMAGE
From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat:
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,13 @@
2002-10-26 Fumitoshi UKAI <ukai@debian.or.jp>
+ * [w3m-dev-en 00788]
+ * fm.h (displayImage): FALSE ifndef USE_IMAGE
+ * rc.c (displayImage): display_image even if USE_IMAGE undefined
+ (sync_with_options): display_image is forced to be FALSE
+ ifndef USE_IMAGE
+
+2002-10-26 Fumitoshi UKAI <ukai@debian.or.jp>
+
* [w3m-dev-en 00783] hsaka@mth.biglobe.ne.jp (Hironori SAKAMOTO)
add display_lineinfo option
* display.c (displayBuffer): check displayLineInfo
diff --git a/fm.h b/fm.h
@@ -828,6 +828,8 @@ global int displayImage init(TRUE);
global int autoImage init(TRUE);
global int useExtImageViewer init(TRUE);
global int maxLoadImage init(4);
+#else
+global int displayImage init(FALSE); /* XXX: emacs-w3m use display_image=off */
#endif
global char *Editor init(DEF_EDITOR);
#ifdef USE_W3MMAILER
diff --git a/rc.c b/rc.c
@@ -467,7 +467,7 @@ struct param_ptr params1[] = {
{"target_self", P_CHARINT, PI_ONOFF, (void *)&TargetSelf, CMT_TSELF, NULL},
{"display_link", P_INT, PI_ONOFF, (void *)&displayLink, CMT_DISPLINK,
NULL},
- {"display_lineinfo", P_INT, PI_ONOFF, (void *)&displayLineInfo,
+ {"display_lineinfo", P_INT, PI_ONOFF, (void *)&displayLineInfo,
CMT_DISPLINEINFO, NULL},
{"ext_dirlist", P_INT, PI_ONOFF, (void *)&UseExternalDirBuffer,
CMT_EXT_DIRLIST, NULL},
@@ -488,9 +488,10 @@ struct param_ptr params1[] = {
CMT_IGNORE_NULL_IMG_ALT, NULL},
{"view_unseenobject", P_INT, PI_ONOFF, (void *)&view_unseenobject,
CMT_VIEW_UNSEENOBJECTS, NULL},
-#ifdef USE_IMAGE
+ /* XXX: emacs-w3m force to off display_image even if image options off */
{"display_image", P_INT, PI_ONOFF, (void *)&displayImage, CMT_DISP_IMAGE,
NULL},
+#ifdef USE_IMAGE
{"auto_image", P_INT, PI_ONOFF, (void *)&autoImage, CMT_AUTO_IMAGE, NULL},
{"max_load_image", P_INT, PI_TEXT, (void *)&maxLoadImage,
CMT_MAX_LOAD_IMAGE, NULL},
@@ -1237,6 +1238,8 @@ sync_with_option(void)
#ifdef USE_IMAGE
if (fmInitialized && displayImage)
initImage();
+#else
+ displayImage = FALSE; /* XXX */
#endif
loadPasswd();