storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev-en 00788]

Browse Source 
* 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>
This commit is contained in:
Fumitoshi UKAI
2002-10-26 11:19:47 +00:00
parent 9726b596a7
commit d36f947bfe
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+9 -1
View File
@@ -1,3 +1,11 @@
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> 2002-10-26 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev-en 00783] hsaka@mth.biglobe.ne.jp (Hironori SAKAMOTO) * [w3m-dev-en 00783] hsaka@mth.biglobe.ne.jp (Hironori SAKAMOTO)
@@ -3979,4 +3987,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.449 2002/10/26 08:10:43 ukai Exp $ $Id: ChangeLog,v 1.450 2002/10/26 11:19:47 ukai Exp $
fm.h
+3 -1
View File
@@ -1,4 +1,4 @@
/* $Id: fm.h,v 1.65 2002/10/26 08:10:43 ukai Exp $ */ /* $Id: fm.h,v 1.66 2002/10/26 11:19:47 ukai Exp $ */
/* /*
* w3m: WWW wo Miru utility * w3m: WWW wo Miru utility
* *
@@ -828,6 +828,8 @@ global int displayImage init(TRUE);
global int autoImage init(TRUE); global int autoImage init(TRUE);
global int useExtImageViewer init(TRUE); global int useExtImageViewer init(TRUE);
global int maxLoadImage init(4); global int maxLoadImage init(4);
#else
global int displayImage init(FALSE); /* XXX: emacs-w3m use display_image=off */
#endif #endif
global char *Editor init(DEF_EDITOR); global char *Editor init(DEF_EDITOR);
#ifdef USE_W3MMAILER #ifdef USE_W3MMAILER
rc.c
+5 -2
View File
@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.51 2002/10/26 08:10:43 ukai Exp $ */ /* $Id: rc.c,v 1.52 2002/10/26 11:19:47 ukai Exp $ */
/* /*
* Initialization file etc. * Initialization file etc.
*/ */
@@ -488,9 +488,10 @@ struct param_ptr params1[] = {
CMT_IGNORE_NULL_IMG_ALT, NULL}, CMT_IGNORE_NULL_IMG_ALT, NULL},
{"view_unseenobject", P_INT, PI_ONOFF, (void *)&view_unseenobject, {"view_unseenobject", P_INT, PI_ONOFF, (void *)&view_unseenobject,
CMT_VIEW_UNSEENOBJECTS, NULL}, 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, {"display_image", P_INT, PI_ONOFF, (void *)&displayImage, CMT_DISP_IMAGE,
NULL}, NULL},
#ifdef USE_IMAGE
{"auto_image", P_INT, PI_ONOFF, (void *)&autoImage, CMT_AUTO_IMAGE, NULL}, {"auto_image", P_INT, PI_ONOFF, (void *)&autoImage, CMT_AUTO_IMAGE, NULL},
{"max_load_image", P_INT, PI_TEXT, (void *)&maxLoadImage, {"max_load_image", P_INT, PI_TEXT, (void *)&maxLoadImage,
CMT_MAX_LOAD_IMAGE, NULL}, CMT_MAX_LOAD_IMAGE, NULL},
@@ -1237,6 +1238,8 @@ sync_with_option(void)
#ifdef USE_IMAGE #ifdef USE_IMAGE
if (fmInitialized && displayImage) if (fmInitialized && displayImage)
initImage(); initImage();
#else
displayImage = FALSE; /* XXX */
#endif #endif
loadPasswd(); loadPasswd();